From: Zdenek Dohnal Date: Thu, 19 Jun 2025 05:36:58 +0000 (+0200) Subject: Update documentation (related to #1086) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce5ea6bc04f1641466458dbd588276ceca6d4891;p=thirdparty%2Fcups.git Update documentation (related to #1086) --- diff --git a/CHANGES.md b/CHANGES.md index 377ab890f6..d0bcf4a3f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ CHANGES - OpenPrinting CUPS Changes in CUPS v2.4.13 (YYYY-MM-DD) ------------------------------------ +- Updated documentation (Issue #1086) - Updated IPP backend to try a sanitized user name if the printer/server does not like the value (Issue #1145) - Updated the scheduler to send the "printer-added" or "printer-modified" events diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index c0c775dec9..440f033d51 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -207,7 +207,7 @@ command is used instead. subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2020-2023 by OpenPrinting. +Copyright © 2020-2024 by OpenPrinting. diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html index c0c3dc6d43..f0dc577dae 100644 --- a/doc/help/man-cups-lpd.html +++ b/doc/help/man-cups-lpd.html @@ -106,7 +106,7 @@ service using the corresponding control program. CUPS Online Help (http://localhost:631/help), RFC 2569

Copyright

-Copyright © 2020-2023 by OpenPrinting. +Copyright © 2020-2024 by OpenPrinting. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 46c3048536..4664cf14fc 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -129,11 +129,11 @@ Note: Only applicable when is run on-demand (e.g., with -l).
JobKillDelay seconds
Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job. -The default is "30". +The default is "300".
JobRetryInterval seconds
Specifies the interval between retries of jobs in seconds. This is typically used for fax queues but can also be used with normal print queues whose error policy is "retry-job". -The default is "30". +The default is "300".
JobRetryLimit count
Specifies the number of retries that are done for jobs. This is typically used for fax queues but can also be used with normal print queues whose error policy is "retry-job". diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html index d10559fa13..32f7fff053 100644 --- a/doc/help/man-mime.types.html +++ b/doc/help/man-mime.types.html @@ -36,9 +36,11 @@ The following functions are available:
match("pattern")
True if the filename matches the given shell wildcard pattern.
ascii(offset,length) -
True if the length bytes starting at offset are valid printable ASCII (CR, NL, TAB, BS, 32-126). length cannot exceed 8192 bytes. +
True if the length bytes starting at offset are valid printable ASCII (CR, NL, TAB, BS, 32-126). +length cannot exceed 8192 bytes.
printable(offset,length) -
True if the length bytes starting at offset are printable 8-bit chars (CR, NL, TAB, BS, 32-126, 128-254). length cannot exceed 8192 bytes. +
True if the length bytes starting at offset are printable 8-bit chars (CR, NL, TAB, BS, 32-126, 128-254). +length cannot exceed 8192 bytes.
priority(number)
Specifies the relative priority of this MIME media type. The default priority is 100. @@ -56,7 +58,8 @@ Larger values have higher priority while smaller values have lower priority.
locale("string")
True if current locale matches string.
contains(offset,length,"string") -
True if the bytes starting at offset for length bytes contains string. length cannot exceed 8192 bytes. +
True if the bytes starting at offset for length bytes contains string. +length cannot exceed 8192 bytes.

String Constants

String constants can be specified inside quotes ("") for strings containing whitespace and angle brackets (<>) for hexadecimal strings. diff --git a/man/client.conf.5 b/man/client.conf.5 index e84fab2e36..7d1d232b89 100644 --- a/man/client.conf.5 +++ b/man/client.conf.5 @@ -142,4 +142,4 @@ On Linux and other systems using GNU TLS, the \fI/etc/cups/ssl/site.crl\fR file, .BR default (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2020-2024 by OpenPrinting. +Copyright \[co] 2020-2025 by OpenPrinting. diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5 index 8358b62a14..ec16c9e137 100644 --- a/man/cups-files.conf.5 +++ b/man/cups-files.conf.5 @@ -212,9 +212,9 @@ Specifies the directory to use for PID and local certificate files. The default is "/var/run/cups" or "/etc/cups" depending on the platform. .\"#StripUserDomain .TP 5 -\StripUserDomain Yes\fR +\fBStripUserDomain Yes\fR .TP 5 -\StripUserDomain No\fR +\fBStripUserDomain No\fR Specifies whether to remove domain from user name during local user authentication (e.g., "user@example.com" –> "user"). This practice can be beneficial for maintaining compatibility with older versions of Kerberos. However, enabling this option can have negative consequences. diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 index 018cfa98bf..4e83170956 100644 --- a/man/cupsd.conf.5 +++ b/man/cupsd.conf.5 @@ -187,13 +187,13 @@ is run on-demand (e.g., with \fB-l\fR). .TP 5 \fBJobKillDelay \fIseconds\fR Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job. -The default is "30". +The default is "300". .\"#JobRetryInterval .TP 5 \fBJobRetryInterval \fIseconds\fR Specifies the interval between retries of jobs in seconds. This is typically used for fax queues but can also be used with normal print queues whose error policy is "retry-job". -The default is "30". +The default is "300". .\"#JobRetryLimit .TP 5 \fBJobRetryLimit \fIcount\fR diff --git a/man/lpstat.1 b/man/lpstat.1 index e554fc9566..c53e89dc07 100644 --- a/man/lpstat.1 +++ b/man/lpstat.1 @@ -82,7 +82,7 @@ Shows the ranking of print jobs. Specifies an alternate username. .TP 5 \fB\-W \fIwhich-jobs\fR -Specifies which jobs to show, "all, "successful", "completed" or "not-completed" (the default). +Specifies which jobs to show, "all", "successful", "completed" or "not-completed" (the default). This option \fImust\fR appear before the \fI-o\fR option and/or any printer names, otherwise the default ("not-completed") value will be used in the request to the scheduler. .TP 5 \fB\-a \fR[\fIprinter(s)\fR]