Update documentation (related to #1086)

diff --git a/CHANGES.md b/CHANGES.md
index 377ab890f633f5cd3c612f81d902ae5f5b6700e0..d0bcf4a3f2a96276f829d68a4da8053fe1c56771 100644 (file)
--- 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 c0c775dec927efb9042fc0db1a34c7086bff6fb2..440f033d5122a895a6674cfc3a039c381e3be68a 100644 (file)
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -207,7 +207,7 @@ command is used instead.
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2020-2023 by OpenPrinting.
+Copyright &copy; 2020-2024 by OpenPrinting.
 
 </body>
 </html>

diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html
index c0c3dc6d43787c76ca2bd5e0244b29c4016c22fd..f0dc577dae3feb1ac7c3f837f114f0df0964a6ab 100644 (file)
--- 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 (<a href="http://localhost:631/help">http://localhost:631/help</a>),
 RFC 2569
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2020-2023 by OpenPrinting.
+Copyright &copy; 2020-2024 by OpenPrinting.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 46c3048536bf0afa2567f0fe029e3ac29e6b6537..4664cf14fc6f3cdd08b5a04fb8a324a9148b4a7b 100644 (file)
--- 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 <b>-l</b>).
 <dt><a name="JobKillDelay"></a><b>JobKillDelay </b><i>seconds</i>
 <dd style="margin-left: 5.0em">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".
 <dt><a name="JobRetryInterval"></a><b>JobRetryInterval </b><i>seconds</i>
 <dd style="margin-left: 5.0em">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".
 <dt><a name="JobRetryLimit"></a><b>JobRetryLimit </b><i>count</i>
 <dd style="margin-left: 5.0em">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 d10559fa1368df4af329914b57a70bd7a3869f38..32f7fff0536296682306eb1acfbbd2a59320b3a4 100644 (file)
--- a/doc/help/man-mime.types.html
+++ b/doc/help/man-mime.types.html
@@ -36,9 +36,11 @@ The following functions are available:
 <dt><b>match("</b><i>pattern</i><b>")</b>
 <dd style="margin-left: 5.0em">True if the filename matches the given shell wildcard <i>pattern</i>.
 <dt><b>ascii(</b><i>offset</i><b>,</b><i>length</i><b>)</b>
-  <dd style="margin-left: 5.0em">True if the <i>length</i> bytes starting at <i>offset</i> are valid printable ASCII (CR, NL, TAB, BS, 32-126). <i>length</i> cannot exceed 8192 bytes.
+<dd style="margin-left: 5.0em">True if the <i>length</i> bytes starting at <i>offset</i> are valid printable ASCII (CR, NL, TAB, BS, 32-126).
+<i>length</i> cannot exceed 8192 bytes.
 <dt><b>printable(</b><i>offset</i><b>,</b><i>length</i><b>)</b>
-<dd style="margin-left: 5.0em">True if the <i>length</i> bytes starting at <i>offset</i> are printable 8-bit chars (CR, NL, TAB, BS, 32-126, 128-254). <i>length</i> cannot exceed 8192 bytes.
+<dd style="margin-left: 5.0em">True if the <i>length</i> bytes starting at <i>offset</i> are printable 8-bit chars (CR, NL, TAB, BS, 32-126, 128-254).
+<i>length</i> cannot exceed 8192 bytes.
 <dt><b>priority(</b><i>number</i><b>)</b>
 <dd style="margin-left: 5.0em">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.
 <dt><b>locale("</b><i>string</i><b>")</b>
 <dd style="margin-left: 5.0em">True if current locale matches <i>string</i>.
 <dt><b>contains(</b><i>offset</i><b>,</b><i>length</i><b>,"</b><i>string</i><b>")</b>
-  <dd style="margin-left: 5.0em">True if the bytes starting at <i>offset</i> for <i>length</i> bytes contains <i>string</i>. <i>length</i> cannot exceed 8192 bytes.
+<dd style="margin-left: 5.0em">True if the bytes starting at <i>offset</i> for <i>length</i> bytes contains <i>string</i>.
+<i>length</i> cannot exceed 8192 bytes.
 </dl>
 <h3><a name="STRING_CONSTANTS">String Constants</a></h3>
 String constants can be specified inside quotes ("") for strings containing whitespace and angle brackets (&lt;>) for hexadecimal strings.

diff --git a/man/client.conf.5 b/man/client.conf.5
index e84fab2e3699a835a20510c32c5dfe03f547d0c4..7d1d232b89b99f7fa0e03572e7fc2fd2c595290b 100644 (file)
--- 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 8358b62a1486ec49491e79174c912838688d88bb..ec16c9e1371f68a775fb38533adeaa6332db9090 100644 (file)
--- 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 018cfa98bf8530892e551c23822591561a48e15b..4e8317095638715153b3261aa525c26ced4d1343 100644 (file)
--- 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 e554fc95660076c9c087ae052c17a0795057e227..c53e89dc07c49a3dd987367155c653cf9e52dafc 100644 (file)
--- 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]