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.

32 lines
1.2 KiB

  1. From f95dc972e2e9e3c245862e45336ff4f014ad5666 Mon Sep 17 00:00:00 2001
  2. From: Jorrit Schippers <jorrit@ncode.nl>
  3. Date: Sat, 9 Apr 2016 20:30:38 +0200
  4. Subject: [PATCH 24/26] DOC: Fix typo in description of `-st` parameter in man
  5. page
  6. extra "wait".
  7. (cherry picked from commit 1458fdbe974562158fc40fd72d745d5fd644c939)
  8. ---
  9. doc/haproxy.1 | 6 +++---
  10. 1 file changed, 3 insertions(+), 3 deletions(-)
  11. diff --git a/doc/haproxy.1 b/doc/haproxy.1
  12. index a836d5d..20c9343 100644
  13. --- a/doc/haproxy.1
  14. +++ b/doc/haproxy.1
  15. @@ -149,9 +149,9 @@ PIDs. Technically speaking, \fBSIGTTOU\fP and \fBSIGUSR1\fP are sent.
  16. .TP
  17. \fB\-st <pidlist>\fP
  18. Send TERMINATE signal to the pids in pidlist after startup. The processes
  19. -which receive this signal will wait immediately terminate, closing all
  20. -active sessions. This option must be specified last, followed by any number
  21. -of PIDs. Technically speaking, \fBSIGTTOU\fP and \fBSIGTERM\fP are sent.
  22. +which receive this signal will terminate immediately, closing all active
  23. +sessions. This option must be specified last, followed by any number of
  24. +PIDs. Technically speaking, \fBSIGTTOU\fP and \fBSIGTERM\fP are sent.
  25. .SH LOGGING
  26. Since HAProxy can run inside a chroot, it cannot reliably access /dev/log.
  27. --
  28. 2.7.3