You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.8 KiB

  1. commit 18aff2297ce844362f28ea5317c289ba154bd33d
  2. Author: Lukas Tribus <lukas@ltri.eu>
  3. Date: Mon Oct 1 02:00:16 2018 +0200
  4. DOC: clarify force-private-cache is an option
  5. "boolean" may confuse users into thinking they need to provide
  6. additional arguments, like false or true. This is a simple option
  7. like many others, so lets not confuse the users with internals.
  8. Also fixes an additional typo.
  9. Should be backported to 1.8 and 1.7.
  10. (cherry picked from commit 2793578eaf934bbf28f742a35f3a1ae656280324)
  11. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  12. diff --git a/doc/configuration.txt b/doc/configuration.txt
  13. index c69033b1..580194ec 100644
  14. --- a/doc/configuration.txt
  15. +++ b/doc/configuration.txt
  16. @@ -1651,7 +1651,7 @@ tune.ssl.cachesize <number>
  17. this value to 0 disables the SSL session cache.
  18. tune.ssl.force-private-cache
  19. - This boolean disables SSL session cache sharing between all processes. It
  20. + This option disables SSL session cache sharing between all processes. It
  21. should normally not be used since it will force many renegotiations due to
  22. clients hitting a random process. But it may be required on some operating
  23. systems where none of the SSL cache synchronization method may be used. In
  24. @@ -6535,7 +6535,7 @@ option smtpchk <hello> <domain>
  25. yes | no | yes | yes
  26. Arguments :
  27. <hello> is an optional argument. It is the "hello" command to use. It can
  28. - be either "HELO" (for SMTP) or "EHLO" (for ESTMP). All other
  29. + be either "HELO" (for SMTP) or "EHLO" (for ESMTP). All other
  30. values will be turned into the default command ("HELO").
  31. <domain> is the domain name to present to the server. It may only be