diff --git a/addons/promex/README b/addons/promex/README index 7f638a5db..8c2266f69 100644 --- a/addons/promex/README +++ b/addons/promex/README @@ -81,9 +81,9 @@ It is possible to filter metrics dumped by the exporter. To to so, multiple "metrics" parameters may be passed to specify all metrics to include or exclude, as a comma-separated list of filter. By default, there is no filter and all metrics are dumped. By specifying at least one metric to be included in the -dump, this disables the default behavior and only explicitly mentionned metrics +dump, this disables the default behavior and only explicitly mentioned metrics are dumped. To include a metric, its name must be specified. To exclude it, its -name must be preceeded by a minus character ('-'). Here are examples: +name must be preceded by a minus character ('-'). Here are examples: # Dumped all metrics, except "haproxy_server_check_status" /metrics?metrics=-haproxy_server_check_status diff --git a/addons/promex/include/promex/promex.h b/addons/promex/include/promex/promex.h index c4712bc21..74ea2f120 100644 --- a/addons/promex/include/promex/promex.h +++ b/addons/promex/include/promex/promex.h @@ -84,13 +84,13 @@ struct promex_label { * is responsible to deinit the dump context. * * * metric_info(): This one is mandatory. It returns the info about the - * metric: name, type and flags and descrition. + * metric: name, type and flags and description. * * * start_ts(): This one is mandatory, it initializes the context for a time * series for a given metric. This context is the second * restart point. * - * * next_ts(): This one is mandatory. It interates on time series for a + * * next_ts(): This one is mandatory. It iterates on time series for a * given metrics. It is also responsible to handle end of a * time series and deinit the context. * diff --git a/doc/DeviceAtlas-device-detection.txt b/doc/DeviceAtlas-device-detection.txt index 2f7ed9f71..9df978377 100644 --- a/doc/DeviceAtlas-device-detection.txt +++ b/doc/DeviceAtlas-device-detection.txt @@ -16,7 +16,7 @@ directory. Also, in the case the api cache support is not needed and/or a C++ to However, if the API had been installed beforehand, DEVICEATLAS_SRC can be omitted. Note that the DeviceAtlas C API version supported is from the 3.x -releases serie (3.2.1 minimum recommended). +releases series (3.2.1 minimum recommended). For HAProxy developers who need to verify that their changes didn't accidentally break the DeviceAtlas code, it is possible to build a dummy library provided in diff --git a/doc/configuration.txt b/doc/configuration.txt index 2f1b4d859..787103fe0 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -15317,7 +15317,7 @@ wait-for-body time