From da3b12ade1516125a982e782be03631b705e304b Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Thu, 22 Feb 2024 10:12:27 +0100
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments

This is 39th iteration of typo fixes
The naming issue on the argument called "unsued" instead of "unused"
in two functions from resolvers and stick-tables was put into a second
patch so that it can be omitted if it were to cause backport issues.
---
 addons/promex/README                  | 4 ++--
 addons/promex/include/promex/promex.h | 4 ++--
 doc/DeviceAtlas-device-detection.txt  | 2 +-
 doc/configuration.txt                 | 2 +-
 src/mux_quic.c                        | 4 ++--
 src/quic_cc_cubic.c                   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

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 <time> [ at-least <bytes> ]
     case HAProxy will respond with a 408 "Request Timeout" error to the client
     and stop processing the request. Note that if any of the other conditions
     happens first, this timeout will not occur even if the full body has
-    not yet been recieved.
+    not yet been received.
 
   This action may be used as a replacement for "option http-buffer-request".
 
diff --git a/src/mux_quic.c b/src/mux_quic.c
index 46e21b4b8..adcda3595 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -1107,7 +1107,7 @@ void qcc_reset_stream(struct qcs *qcs, int err)
 		/* Soft offset cannot be inferior to real one. */
 		BUG_ON(qcc->tx.fc.off_soft - diff < qcc->tx.fc.off_real);
 
-		/* Substract to conn flow control data amount prepared on stream not yet sent. */
+		/* Subtract to conn flow control data amount prepared on stream not yet sent. */
 		qcc->tx.fc.off_soft -= diff;
 		if (soft_blocked && !qfctl_sblocked(&qcc->tx.fc))
 			qcc_notify_fctl(qcc);
@@ -2010,7 +2010,7 @@ static int qcs_send_stop_sending(struct qcs *qcs)
 }
 
 /* Used internally by qcc_io_send function. Proceed to send for <qcs>. A STREAM
- * frame is generated poiting to QCS stream descriptor content and inserted in
+ * frame is generated pointing to QCS stream descriptor content and inserted in
  * <frms> list. Frame length will be truncated if greater than <window_conn>.
  * This allows to prepare several frames in a loop while respecting connection
  * flow control window.
diff --git a/src/quic_cc_cubic.c b/src/quic_cc_cubic.c
index 76a62acd0..d121bdb11 100644
--- a/src/quic_cc_cubic.c
+++ b/src/quic_cc_cubic.c
@@ -242,7 +242,7 @@ static inline void quic_cubic_update(struct quic_cc *cc, uint32_t acked)
 			 * Note that K is stored in milliseconds.
 			 */
 			c->K = cubic_root(((c->last_w_max - path->cwnd) << CUBIC_SCALE_FACTOR_SHIFT) / (CUBIC_C_SCALED * path->mtu));
-			/* Convert to miliseconds. */
+			/* Convert to milliseconds. */
 			c->K *= 1000;
 			c->W_target = c->last_w_max;
 		}