From: Krzysztof Piotr Oledzki Date: Sun, 13 Dec 2009 20:55:50 +0000 (+0100) Subject: [DOC] some small spell fixes and unifications X-Git-Tag: v1.4-dev5~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f864533c050a0bb7015627a7c24fe91bb1f85517;p=thirdparty%2Fhaproxy.git [DOC] some small spell fixes and unifications Traditionnally -> Traditionally preceeded -> preceded statictics -> statistics (...) --- diff --git a/doc/configuration.txt b/doc/configuration.txt index 3c6dd642eb..87c34429d3 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -102,7 +102,7 @@ correct rules and to debug existing configurations. ------------------------------- The HTTP protocol is transaction-driven. This means that each request will lead -to one and only one response. Traditionnally, a TCP connection is established +to one and only one response. Traditionally, a TCP connection is established from the client to the server, a request is sent by the client on the connection, the server responds and the connection is closed. A new request will involve a new connection : @@ -341,14 +341,14 @@ HAProxy's configuration process involves 3 major sources of parameters : The configuration file syntax consists in lines beginning with a keyword referenced in this manual, optionally followed by one or several parameters delimited by spaces. If spaces have to be entered in strings, then they must be -preceeded by a backslash ('\') to be escaped. Backslashes also have to be +preceded by a backslash ('\') to be escaped. Backslashes also have to be escaped by doubling them. 2.2. Time format ---------------- -Some parameters involve values representating time, such as timeouts. These +Some parameters involve values representing time, such as timeouts. These values are generally expressed in milliseconds (unless explicitly stated otherwise) but may be expressed in any other unit by suffixing the unit to the numeric value. It is important to consider this because it will not be repeated @@ -480,7 +480,7 @@ stats socket [{uid | user} ] [{gid | group} ] [mode ] Creates a UNIX socket in stream mode at location . Any previously existing socket will be backed up then replaced. Connections to this socket - will return various statictics outputs and even allow some commands to be + will return various statistics outputs and even allow some commands to be issued. Please consult section 9.2 "Unix Socket commands" for more details. An optional "level" parameter can be specified to restrict the nature of @@ -587,7 +587,7 @@ nosplice Disables the use of kernel tcp splicing between sockets on Linux. It is equivalent to the command line argument "-dS". Data will then be copied using conventional and more portable recv/send calls. Kernel tcp splicing is - limited to some very recent instances of kernel 2.6. Most verstions between + limited to some very recent instances of kernel 2.6. Most versions between 2.6.25 and 2.6.28 are buggy and will forward corrupted data, so they must not be used. This option makes it easier to globally disable kernel splicing in case of doubt. See also "option splice-auto", "option splice-request" and @@ -689,7 +689,7 @@ name, as this configuration seems to be commonly encountered. Right now, two major proxy modes are supported : "tcp", also known as layer 4, and "http", also known as layer 7. In layer 4 mode, HAProxy simply forwards -bidirectionnal traffic between two sides. In layer 7 mode, HAProxy analyzes the +bidirectional traffic between two sides. In layer 7 mode, HAProxy analyzes the protocol, and can interact with it by allowing, blocking, switching, adding, modifying, or removing arbitrary contents in requests or responses, based on arbitrary criteria. @@ -999,7 +999,7 @@ balance url_param [check_post []] number of running servers changing, many clients will be directed to a different server. This algorithm is generally used in TCP mode where no cookie may be inserted. It may also - be used on the Internet to provide a best-effort stickyness + be used on the Internet to provide a best-effort stickiness to clients which refuse session cookies. This algorithm is static by default, which means that changing a server's weight on the fly will have no effect, but this can be @@ -1071,10 +1071,10 @@ balance url_param [check_post []] hdr(name) The HTTP header will be looked up in each HTTP request. Just as with the equivalent ACL 'hdr()' function, the header name in parenthesis is not case sensitive. If the header is - absent or if it does not contain any value, the round-robin + absent or if it does not contain any value, the roundrobin algorithm is applied instead. - An optionnal 'use_domain_only' parameter is available, for + An optional 'use_domain_only' parameter is available, for reducing the hash algorithm to the main domain part with some specific headers such as 'Host'. For instance, in the Host value "haproxy.1wt.eu", only "1wt" will be considered. @@ -1091,7 +1091,7 @@ balance url_param [check_post []] is not case-sensitive. This mechanism is useful as a degraded persistence mode, as it makes it possible to always send the same user (or the same session ID) to the same server. If the - cookie is not found, the normal round-robind algorithm is + cookie is not found, the normal roundrobin algorithm is used instead. Note that for this to work, the frontend must ensure that an @@ -1125,7 +1125,7 @@ balance url_param [check_post []] Note: the following caveats and limitations on using the "check_post" extension with "url_param" must be considered : - - all POST requests are eligable for consideration, because there is no way + - all POST requests are eligible for consideration, because there is no way to determine if the parameters will be found in the body or entity which may contain binary data. Therefore another method may be required to restrict consideration of POST requests that have no URL parameters in @@ -1149,7 +1149,7 @@ balance url_param [check_post []] - This feature does not support generation of a 100, 411 or 501 response. - In some cases, requesting "check_post" MAY attempt to scan the entire - contents of a message body. Scaning normally terminates when linear + contents of a message body. Scanning normally terminates when linear white space or control characters are found, indicating the end of what might be a URL parameter list. This is probably not a concern with SGML type message bodies. @@ -1208,7 +1208,7 @@ bind [
]: [, ...] defer-accept transparent is an optional keyword which is supported only on certain Linux kernels. It indicates that the addresses will be bound even if they do not belong to the local machine. Any packet - targetting any of these addresses will be caught just as if + targeting any of these addresses will be caught just as if the address was locally configured. This normally requires that IP forwarding is enabled. Caution! do not use this with the default address '*', as it would redirect any traffic for @@ -1344,7 +1344,7 @@ capture cookie len the log format does not change for a given frontend depending on the backends. This may change in the future. Note that there can be only one "capture cookie" statement in a frontend. The maximum capture length is - configured in the souces by default to 64 characters. It is not possible to + configured in the sources by default to 64 characters. It is not possible to specify a capture in a "defaults" section. Example: @@ -1376,7 +1376,7 @@ capture request header len headers will be logged just as an empty string. Common uses for request header captures include the "Host" field in virtual hosting environments, the "Content-length" when uploads are supported, "User-agent" to quickly - differenciate between real users and robots, and "X-Forwarded-For" in proxied + differentiate between real users and robots, and "X-Forwarded-For" in proxied environments to find where the request came from. Note that when capturing headers such as "User-agent", some spaces may be @@ -1584,7 +1584,7 @@ cookie [ rewrite | insert | prefix ] [ indirect ] [ nocache ] See also the "insert" and "nocache" options. domain This option allows to specify the domain at which a cookie is - inserted. It requires exactly one paramater: a valid domain + inserted. It requires exactly one parameter: a valid domain name. If the domain begins with a dot, the browser is allowed to use it for any host ending with that name. It is also possible to specify several domain names by invoking this option multiple @@ -1772,7 +1772,7 @@ fullconn values when the backend has less than concurrent connections. This makes it possible to limit the load on the servers during normal loads, but push it further for important loads without overloading the servers during - exceptionnal loads. + exceptional loads. Example : # The servers will accept between 100 and 1000 concurrent connections each @@ -1797,7 +1797,7 @@ grace