diff --git a/doc/SPOE.txt b/doc/SPOE.txt index a8bbea660..dfc0b718b 100644 --- a/doc/SPOE.txt +++ b/doc/SPOE.txt @@ -41,7 +41,7 @@ SUMMARY * SPOE : Stream Processing Offload Engine. - A SPOE is a filter talking to servers managed ba a SPOA to offload the + A SPOE is a filter talking to servers managed by a SPOA to offload the stream processing. An engine is attached to a proxy. A proxy can have several engines. Each engine is linked to an agent and only one. @@ -253,7 +253,7 @@ option continue-on-error By default, for a specific stream, when an abnormal/unexpected error occurs, the SPOE is disabled for all the transaction. So if you have several events - configured, such error on an event will disabled all followings. For TCP + configured, such error on an event will disabled all following. For TCP streams, this will disable the SPOE for the whole session. For HTTP streams, this will disable it for the transaction (request and response). @@ -980,7 +980,7 @@ HAProxy sends a HAPROXY-DISCONNECT frame with the corresponding error. If "healthcheck" item was set to TRUE in the HAPROXY-HELLO frame, the agent can safely close the connection without DISCONNECT frame. In all cases, HAProxy -will close the connexion at the end of the health check. +will close the connection at the end of the health check. 3.2.6. Frame: NOTIFY --------------------- @@ -1176,7 +1176,7 @@ An agent can define its own errors using a not yet assigned status code. IMPORTANT NOTE: By default, for a specific stream, when an abnormal/unexpected error occurs, the SPOE is disabled for all the transaction. So if you have several events configured, such error on an event - will disabled all followings. For TCP streams, this will + will disabled all following. For TCP streams, this will disable the SPOE for the whole session. For HTTP streams, this will disable it for the transaction (request and response). See 'option continue-on-error' to bypass this limitation. diff --git a/doc/configuration.txt b/doc/configuration.txt index 291242b9e..186d9a8ae 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -5007,7 +5007,7 @@ http-error status [content-type ] May be used in sections : defaults | frontend | listen | backend yes | yes | yes | yes Arguments : - staus is the HTTP status code. It must be specified. + status is the HTTP status code. It must be specified. Currently, HAProxy is capable of generating codes 200, 400, 401, 403, 404, 405, 407, 408, 410, 425, 429, 500, 502, 503, and 504. @@ -5233,7 +5233,7 @@ http-request deny [ { status | deny_status } ] [content-type ] This stops the evaluation of the rules and immediately rejects the request. By default an HTTP 403 error is returned. But the response may be customized using same syntax than "http-request return" rules. Thus, see "http-request - return" for details. For compatiblity purpose, when no argument is defined, + return" for details. For compatibility purpose, when no argument is defined, or only "deny_status", the argument "default-errorfiles" is implied. It means "http-request deny [deny_status ]" is an alias of "http-request deny [status ] default-errorfiles". @@ -5490,7 +5490,7 @@ http-request return [status ] [content-type ] Note that the generated response must be smaller than a buffer. And to avoid any warning, when an errorfile or a raw file is loaded, the buffer space - reserved to the headers rewritting should also be free. + reserved to the headers rewriting should also be free. No further "http-request" rules are evaluated. @@ -5832,7 +5832,7 @@ http-request tarpit [ { status | deny_status } ] [content-type ] number of concurrent connections. By default an HTTP error 500 is returned. But the response may be customized using same syntax than "http-request return" rules. Thus, see "http-request return" for details. - For compatiblity purpose, when no argument is defined, or only "deny_status", + For compatibility purpose, when no argument is defined, or only "deny_status", the argument "default-errorfiles" is implied. It means "http-request tarpit [deny_status ]" is an alias of "http-request tarpit [status ] default-errorfiles". @@ -6031,7 +6031,7 @@ http-response deny [ { status | deny_status } ] [content-type ] This stops the evaluation of the rules and immediately rejects the response. By default an HTTP 502 error is returned. But the response may be customized using same syntax than "http-response return" rules. Thus, see - "http-response return" for details. For compatiblity purpose, when no + "http-response return" for details. For compatibility purpose, when no argument is defined, or only "deny_status", the argument "default-errorfiles" is implied. It means "http-response deny [deny_status ]" is an alias of "http-response deny [status ] default-errorfiles". @@ -6137,7 +6137,7 @@ http-response return [status ] [content-type ] Note that the generated response must be smaller than a buffer. And to avoid any warning, when an errorfile or a raw file is loaded, the buffer space - reserved to the headers rewritting should also be free. + reserved to the headers rewriting should also be free. No further "http-response" rules are evaluated. @@ -12026,7 +12026,7 @@ use-server unless configuration and an error is reported if the specified server does not exist. If it is a log-format, no check is performed when parsing the configuration, and if we can't resolve a valid server name at runtime but the use-server rule - was conditionned by an ACL returning true, no other use-server rule is applied + was conditioned by an ACL returning true, no other use-server rule is applied and we fall back to load balancing. See also: "use_backend", section 5 about server and section 7 about ACLs. @@ -19937,7 +19937,7 @@ no option get-values "1" otherwise. Some FastCGI applications does not support this feature. Some others close - the connexion immediately after sending their response. So, by default, this + the connection immediately after sending their response. So, by default, this option is disabled. Note that the maximum number of concurrent requests accepted by a FastCGI diff --git a/doc/internals/htx-api.txt b/doc/internals/htx-api.txt index 77bbec9bd..e783e0ebf 100644 --- a/doc/internals/htx-api.txt +++ b/doc/internals/htx-api.txt @@ -147,7 +147,7 @@ Because the payloads part may wrap, there are 2 usable free spaces: free space free space -Finally, when the usable free space is not enough to store a new block, unsuable +Finally, when the usable free space is not enough to store a new block, unusable parts may be get back with a full defragmentation. The payloads part is then realigned at the beginning of the blocks array and the free space becomes continuous again. diff --git a/doc/lua-api/index.rst b/doc/lua-api/index.rst index 3d8282cdb..c45753d7d 100644 --- a/doc/lua-api/index.rst +++ b/doc/lua-api/index.rst @@ -2488,7 +2488,7 @@ AppletHTTP class :param class_AppletHTTP applet: An :ref:`applethttp_class` :param integer size: the required read size. - :returns: always return a string,the string can be empty is the connexion is + :returns: always return a string,the string can be empty is the connection is closed. .. js:function:: AppletHTTP.send(applet, msg) @@ -2603,7 +2603,7 @@ AppletTCP class :param class_AppletTCP applet: An :ref:`applettcp_class` :param integer size: the required read size. - :returns: always return a string,the string can be empty is the connexion is + :returns: always return a string,the string can be empty is the connection is closed. .. js:function:: AppletTCP.send(appletmsg) diff --git a/doc/lua.txt b/doc/lua.txt index 47ce089db..743276d50 100644 --- a/doc/lua.txt +++ b/doc/lua.txt @@ -371,7 +371,7 @@ behaviour is the following: The behaviour of the point 5 represents the inheritance. In HAProxy all the provided objects are tables, the entry "[0]" contains private -data, there are often userdata or lightuserdata. The matatable is registered in +data, there are often userdata or lightuserdata. The metatable is registered in the global part of the main Lua stack, and it is called with the case sensitive class name. A great part of these class must not be used directly because it requires an initialisation using the HAProxy internal structs.