[PATCH] DOC: general: fix white spaces for HTML converter

2021-04-24 Thread Aleksandar Lazic

Hi.

The HTML converter expects some formats to recognize if a keyword is a
keyword.

Regards
alex
>From 9ed588c09a3ceb3af62bc9e4f9c7950fe0c58c7f Mon Sep 17 00:00:00 2001
From: Alex 
Date: Sat, 24 Apr 2021 13:02:21 +0200
Subject: [PATCH] DOC: general: fix white spaces for HTML converter

The HTML converter expects some formats to recognize if a keyword is a
keyword.

---
 doc/configuration.txt | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 375eedafa..65831e242 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -16255,7 +16255,7 @@ mod()
   This prefix is followed by a name. The separator is a '.'. The name may only
   contain characters 'a-z', 'A-Z', '0-9', '.' and '_'.
 
-mqtt_field_value(,)
+mqtt_field_value(,)
   Returns value of  found in input MQTT payload of type
   .
can be either a string (case insensitive matching) or a numeric
@@ -17318,17 +17318,17 @@ srv_sess_rate([/]) : integer
 acl srv2_full srv_sess_rate(be1/srv2) gt 50
 use_backend be2 if srv1_full or srv2_full
 
-srv_iweight([/]): integer
+srv_iweight([/]) : integer
   Returns an integer corresponding to the server's initial weight. If 
   is omitted, then the server is looked up in the current backend. See also
   "srv_weight" and "srv_uweight".
 
-srv_uweight([/]): integer
+srv_uweight([/]) : integer
   Returns an integer corresponding to the user visible server's weight. If
is omitted, then the server is looked up in the current
   backend. See also "srv_weight" and "srv_iweight".
 
-srv_weight([/]): integer
+srv_weight([/]) : integer
   Returns an integer corresponding to the current (or effective) server's
   weight. If  is omitted, then the server is looked up in the current
   backend. See also "srv_iweight" and "srv_uweight".
-- 
2.25.1



[PATCH] typo fixes

2021-04-24 Thread Илья Шипицин
hello,

one more typo fixing.

Ilya
From 95a5f29e573ef02bc31c74d426f2db8fbdc1f57d Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin 
Date: Sat, 24 Apr 2021 13:25:42 +0500
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments

This is 22nd iteration of typo fixes
---
 doc/configuration.txt| 6 +++---
 doc/management.txt   | 2 +-
 include/haproxy/action.h | 2 +-
 include/haproxy/cpuset.h | 2 +-
 include/import/slz.h | 2 +-
 src/action.c | 2 +-
 src/cfgdiag.c| 2 +-
 src/check.c  | 2 +-
 src/fd.c | 2 +-
 src/http_act.c   | 4 ++--
 src/http_ana.c   | 6 +++---
 src/sink.c   | 4 ++--
 src/slz.c| 8 
 src/tcpcheck.c   | 4 ++--
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 375eedafa..db78c0704 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -6794,7 +6794,7 @@ http-request wait-for-body time  [ at-least  ]
   follows the HAProxy time format and is expressed in milliseconds.
 
is optional. It is the minimum payload size to receive to stop to
-  wait. It fallows the HAProxy size format and is expressed in
+  wait. It follows the HAProxy size format and is expressed in
   bytes.
 
   Example:
@@ -7248,7 +7248,7 @@ http-response wait-for-body time  [ at-least  ]
   follows the HAProxy time format and is expressed in milliseconds.
 
is optional. It is the minimum payload size to receive to stop to
-  wait. It fallows the HAProxy size format and is expressed in
+  wait. It follows the HAProxy size format and is expressed in
   bytes.
 
   Example:
@@ -12100,7 +12100,7 @@ tcp-request content  [{if | unless} ]
   "tcp-request content" rules are not evaluated. This upgrade method should be
   preferred to the implicit one consisting to rely on the backend mode. When
   used, it is possible to set HTTP directives in a frontend without any
-  warning. These directives will be conditionnaly evaluated if the HTTP upgrade
+  warning. These directives will be conditionaly evaluated if the HTTP upgrade
   is performed. However, an HTTP backend must still be selected. It remains
   unsupported to route an HTTP connection (upgraded or not) to a TCP server.
 
diff --git a/doc/management.txt b/doc/management.txt
index cee26839a..1e79eb788 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1793,7 +1793,7 @@ set var  
may only involve "internal" sample fetch keywords and converters
   even though the most likely useful ones will be str('something') or int().
   Note that the command line parser doesn't know about quotes, so any space in
-  the expression must be preceeded by a backslash. This command requires levels
+  the expression must be preceded by a backslash. This command requires levels
   "operator" or "admin". This command is only supported on a CLI connection
   running in experimental mode (see "experimental-mode on").
 
diff --git a/include/haproxy/action.h b/include/haproxy/action.h
index 62fba7ed3..39f756f16 100644
--- a/include/haproxy/action.h
+++ b/include/haproxy/action.h
@@ -77,7 +77,7 @@ static inline void action_build_list(struct list *keywords,
 }
 
 /* Check an action ruleset validity. It returns the number of error encountered
- * andd err_code is updated if a warning is emitted.
+ * and err_code is updated if a warning is emitted.
  */
 int check_action_rules(struct list *rules, struct proxy *px, int *err_code);
 
diff --git a/include/haproxy/cpuset.h b/include/haproxy/cpuset.h
index f6cea4325..6e1627131 100644
--- a/include/haproxy/cpuset.h
+++ b/include/haproxy/cpuset.h
@@ -27,7 +27,7 @@ int ha_cpuset_count(const struct hap_cpuset *set);
 
 /* Returns the first index set plus one in  starting from the lowest.
  * Returns 0 if no index set.
- * Do not forget to substract the result by one if using it for set/clr.
+ * Do not forget to subtract the result by one if using it for set/clr.
  */
 int ha_cpuset_ffs(const struct hap_cpuset *set);
 
diff --git a/include/import/slz.h b/include/import/slz.h
index 0251a855f..0f284e303 100644
--- a/include/import/slz.h
+++ b/include/import/slz.h
@@ -151,7 +151,7 @@ static inline long slz_encode(struct slz_stream *strm, void *out,
  * It returns the number of bytes emitted. The trailer consists in flushing the
  * possibly pending bits from the queue (up to 24 bits), rounding to the next
  * byte, then 4 bytes for the CRC when doing zlib/gzip, then another 4 bytes
- * for the input length for gzip. That may abount to 4+4+4 = 12 bytes, that the
+ * for the input length for gzip. That may about to 4+4+4 = 12 bytes, that the
  * caller must ensure are available before calling the function.
  */
 static inline int slz_finish(struct slz_stream *strm, void *buf)
diff --git a/src/action.c b/src/action.c
index 5e430f23a..98359badd