From: Michael R Sweet Date: Thu, 11 Mar 2021 17:40:58 +0000 (-0500) Subject: Update cupsd.conf.5 man page to address feedback from Till. X-Git-Tag: v2.4b1~188^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F126%2Fhead;p=thirdparty%2Fcups.git Update cupsd.conf.5 man page to address feedback from Till. --- diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index bbdb13e9ab..798ab63261 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -242,7 +242,7 @@ The default is "Yes".
ReadyPaperSizes sizename[,...]
Specifies a list of potential paper sizes that are reported as "ready" (loaded). The actual list will only contain sizes that each printer supports. -The default is "Letter,Legal,Tabloid,4x6,Env10" for North America and "A3,A4,A5,A6,EnvDL" elsewhere. +The default is "Letter,Legal,Tabloid,4x6,Env10" when the default paper size is "Letter" and "A3,A4,A5,A6,EnvDL" otherwise. Note: Paper sizes must use the size names from the PPD file and not PWG self-describing media size names.
ReloadTimeout seconds
Specifies the amount of time to wait for job completion before restarting the scheduler. diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 index a4843da602..58decc8f36 100644 --- a/man/cupsd.conf.5 +++ b/man/cupsd.conf.5 @@ -376,7 +376,7 @@ The default is "Yes". \fBReadyPaperSizes \fIsizename[,...]\fR Specifies a list of potential paper sizes that are reported as "ready" (loaded). The actual list will only contain sizes that each printer supports. -The default is "Letter,Legal,Tabloid,4x6,Env10" for North America and "A3,A4,A5,A6,EnvDL" elsewhere. +The default is "Letter,Legal,Tabloid,4x6,Env10" when the default paper size is "Letter" and "A3,A4,A5,A6,EnvDL" otherwise. Note: Paper sizes must use the size names from the PPD file and not PWG self-describing media size names. .\"#ReloadTimeout .TP 5