DOC: minor typo fixes to improve HTML parsing by haproxy-dconv

This must be backported to 1.6 and 1.5
This commit is contained in:
Olivier Doucet 2016-08-05 17:15:20 +02:00 committed by Willy Tarreau
parent 568743a21f
commit aa1ea8a9ee

View File

@ -4421,20 +4421,19 @@ load-server-state-from-file { global | local | none }
- server's weight is applied from previous running process unless it has - server's weight is applied from previous running process unless it has
has changed between previous and new configuration files. has changed between previous and new configuration files.
Example 1: Example: Minimal configuration
Minimal configuration: global
stats socket /tmp/socket
server-state-file /tmp/server_state
global defaults
stats socket /tmp/socket load-server-state-from-file global
server-state-file /tmp/server_state
defaults backend bk
load-server-state-from-file global server s1 127.0.0.1:22 check weight 11
server s2 127.0.0.1:22 check weight 12
backend bk
server s1 127.0.0.1:22 check weight 11
server s2 127.0.0.1:22 check weight 12
Then one can run : Then one can run :
@ -4447,9 +4446,7 @@ load-server-state-from-file { global | local | none }
1 bk 1 s1 127.0.0.1 2 0 11 11 4 6 3 4 6 0 0 1 bk 1 s1 127.0.0.1 2 0 11 11 4 6 3 4 6 0 0
1 bk 2 s2 127.0.0.1 2 0 12 12 4 6 3 4 6 0 0 1 bk 2 s2 127.0.0.1 2 0 12 12 4 6 3 4 6 0 0
Example 2: Example: Minimal configuration
Minimal configuration:
global global
stats socket /tmp/socket stats socket /tmp/socket
@ -4462,6 +4459,7 @@ load-server-state-from-file { global | local | none }
server s1 127.0.0.1:22 check weight 11 server s1 127.0.0.1:22 check weight 11
server s2 127.0.0.1:22 check weight 12 server s2 127.0.0.1:22 check weight 12
Then one can run : Then one can run :
socat /tmp/socket - <<< "show servers state bk" > /etc/haproxy/states/bk socat /tmp/socket - <<< "show servers state bk" > /etc/haproxy/states/bk
@ -5187,7 +5185,7 @@ option forwardfor [ except <network> ] [ header <name> ] [ if-none ]
the frontend or the backend does not specify it, it wants the addition to be the frontend or the backend does not specify it, it wants the addition to be
mandatory, so it wins. mandatory, so it wins.
Examples : Example :
# Public HTTP address also used by stunnel on the same machine # Public HTTP address also used by stunnel on the same machine
frontend www frontend www
mode http mode http
@ -10796,7 +10794,9 @@ resolve-prefer <family>
Supported in default-server: Yes Supported in default-server: Yes
Example: server s1 app1.domain.com:80 resolvers mydns resolve-prefer ipv6 Example:
server s1 app1.domain.com:80 resolvers mydns resolve-prefer ipv6
resolve-net <network>[,<network[,...]] resolve-net <network>[,<network[,...]]
This options prioritize th choice of an ip address matching a network. This is This options prioritize th choice of an ip address matching a network. This is
@ -10808,7 +10808,9 @@ resolve-net <network>[,<network[,...]]
Supported in default-server: Yes Supported in default-server: Yes
Example: server s1 app1.domain.com:80 resolvers mydns resolve-net 10.0.0.0/8 Example:
server s1 app1.domain.com:80 resolvers mydns resolve-net 10.0.0.0/8
resolvers <id> resolvers <id>
Points to an existing "resolvers" section to resolve current server's Points to an existing "resolvers" section to resolve current server's
@ -10820,9 +10822,11 @@ resolvers <id>
Supported in default-server: No Supported in default-server: No
Example: server s1 app1.domain.com:80 check resolvers mydns Example:
See also chapter 5.3 server s1 app1.domain.com:80 check resolvers mydns
See also section 5.3
send-proxy send-proxy
The "send-proxy" parameter enforces use of the PROXY protocol over any The "send-proxy" parameter enforces use of the PROXY protocol over any
@ -11138,7 +11142,7 @@ timeout <event> <time>
<time> : time related to the event. It follows the HAProxy time format. <time> : time related to the event. It follows the HAProxy time format.
<time> is expressed in milliseconds. <time> is expressed in milliseconds.
Example of a resolvers section (with default values): Example:
resolvers mydns resolvers mydns
nameserver dns1 10.0.0.1:53 nameserver dns1 10.0.0.1:53
@ -14590,7 +14594,6 @@ with a star ('*') after the field name below.
15 '{' captured_response_headers* '}' {} 15 '{' captured_response_headers* '}' {}
16 '"' http_request '"' "GET /index.html HTTP/1.1" 16 '"' http_request '"' "GET /index.html HTTP/1.1"
Detailed fields description : Detailed fields description :
- "client_ip" is the IP address of the client which initiated the TCP - "client_ip" is the IP address of the client which initiated the TCP
connection to haproxy. If the connection was accepted on a UNIX socket connection to haproxy. If the connection was accepted on a UNIX socket