From: Alex <al-haproxy@none.at>
Date: Tue, 27 Apr 2021 10:57:07 +0000 (+0200)
Subject: DOC: general: fix example in set-timeout
X-Git-Tag: v2.4-dev18~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59c5335dbe913230aaa8869eccd33cb7266afaee;p=thirdparty%2Fhaproxy.git

DOC: general: fix example in set-timeout

The alternative arguments are always in curly brackets, let's fix it for
set-timeout.
The Example in set-timeout does not have the one of the required argument.

This commit makes the PR https://github.com/cbonte/haproxy-dconv/pull/34
obsolete.
---

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 0453380f65..0808433ec9 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -6571,7 +6571,7 @@ http-request set-src-port <expr> [ { if | unless } <condition> ]
   the address family supports a port, otherwise it forces the source address to
   IPv4 "0.0.0.0" before rewriting the port.
 
-http-request set-timeout server|tunnel { <timeout> | <expr> }
+http-request set-timeout { server | tunnel } { <timeout> | <expr> }
                                        [ { if | unless } <condition> ]
 
   This action overrides the specified "server" or "tunnel" timeout for the
@@ -6586,8 +6586,8 @@ http-request set-timeout server|tunnel { <timeout> | <expr> }
   results.
 
   Example:
-    http-request set-timeout server 5s
-    http-request set-timeout hdr(host),map_int(host.lst)
+    http-request set-timeout tunnel 5s
+    http-request set-timeout server req.hdr(host),map_int(host.lst)
 
 http-request set-tos <tos> [ { if | unless } <condition> ]