From: DrDaveD <2129743+DrDaveD@users.noreply.github.com>
Date: Wed, 1 Jan 2020 22:56:34 +0000 (+0000)
Subject: Bug 5007: Docs: Fix max_filedescriptors description (#529)
X-Git-Tag: 4.15-20210522-snapshot~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfab2c11e0a5d10d64c208e92a35b2b141df24d1;p=thirdparty%2Fsquid.git

Bug 5007: Docs: Fix max_filedescriptors description (#529)

max_filedescriptors can also be used to _raise_  the number of
descriptors (up to the OS hard limit).
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index f69f67198c..2e515830ee 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -10402,13 +10402,14 @@ DOC_END
 NAME: max_filedescriptors max_filedesc
 TYPE: int
 DEFAULT: 0
-DEFAULT_DOC: Use operating system limits set by ulimit.
+DEFAULT_DOC: Use operating system soft limit set by ulimit.
 LOC: Config.max_filedescriptors
 DOC_START
-	Reduce the maximum number of filedescriptors supported below
-	the usual operating system defaults.
+	Set the maximum number of filedescriptors, either below the
+	operating system default or up to the hard limit.
 
-	Remove from squid.conf to inherit the current ulimit setting.
+	Remove from squid.conf to inherit the current ulimit soft
+	limit setting.
 
 	Note: Changing this requires a restart of Squid. Also
 	not all I/O types supports large values (eg on Windows).