Merge r3407:

Correct defaults in varnishd.1

The defaults for thread_pool_min and thread_pools were wrong; fixed.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/branches/2.0@3555 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/varnishd.1 b/varnish-cache/bin/varnishd/varnishd.1
index 63c7144bba2ae187fc3eb1b4c2e61e8a271d2324..7b314b12f03a964a4a910569ca371f79566da56f 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.1
+++ b/varnish-cache/bin/varnishd/varnishd.1
@@ -520,7 +520,7 @@ Higher values may allow
 .Nm
 to respond faster to a sudden increase in traffic.
 .Pp
-The default is 1.
+The default is 5.
 .It Va thread_pools
 The number of worker thread pools.
 Higher values reduce lock contention but increase pressure on the
@@ -528,7 +528,7 @@ scheduler.
 Note that a decrease of this parameter will only take effect after a
 restart.
 .Pp
-The default is 1.
+The default is 2.
 .It Va thread_pool_timeout
 The amount of time a worker thread can be idle before it is killed,
 when the number of worker threads exceeds