From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 21 Jun 2016 18:00:08 +0000 (-0400)
Subject: Reword the IdleExitTimeout description...
X-Git-Tag: v2.2b2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08d027c3b671c1676709fc1fd8dc994ad1458c99;p=thirdparty%2Fcups.git

Reword the IdleExitTimeout description...
---

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 1af903b642..bfe8e3dbb3 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -131,11 +131,11 @@ Double lookups also prevent clients with unregistered addresses from connecting
 The default is "Off" to avoid the potential server performance problems with hostname lookups.
 Only set this option to "On" or "Double" if absolutely required.
 <dt><a name="IdleExitTimeout"></a><b>IdleExitTimeout </b><i>seconds</i>
-<dd style="margin-left: 5.0em">Only applicable when
+<dd style="margin-left: 5.0em">Specifies the length of time to wait before shutting down due to inactivity.
+The default is "60" seconds.
+Note: Only applicable when
 <a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8)</a>
 is run on-demand (e.g., with <b>-l</b>).
-Specifies the length of time to wait before shutting down due to inactivity.
-The default is "60".
 <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".
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index ddd38fc2d1..d4b2f8c1f8 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -10,7 +10,7 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd.conf 5 "CUPS" "29 March 2016" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "21 June 2016" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -194,11 +194,11 @@ Only set this option to "On" or "Double" if absolutely required.
 .\"#IdleExitTimeout
 .TP 5
 \fBIdleExitTimeout \fIseconds\fR
-Only applicable when
+Specifies the length of time to wait before shutting down due to inactivity.
+The default is "60" seconds.
+Note: Only applicable when
 .BR cupsd (8)
 is run on-demand (e.g., with \fB-l\fR).
-Specifies the length of time to wait before shutting down due to inactivity.
-The default is "60".
 .\"#JobKillDelay
 .TP 5
 \fBJobKillDelay \fIseconds\fR