diff --git a/doc/configuration.txt b/doc/configuration.txt index 964bc04ce..a716c3481 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -12247,7 +12247,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 conditionaly evaluated if the HTTP upgrade + warning. These directives will be conditionally 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/src/activity.c b/src/activity.c index 6b9430c7d..4dc832ef6 100644 --- a/src/activity.c +++ b/src/activity.c @@ -112,7 +112,7 @@ static __attribute__((noreturn)) void memprof_die(const char *msg) * Worse, we have to account for the risk of reentrance from dlsym() when * it tries to prepare its error messages. Here its ahndled by in_memprof * that makes allocators return NULL. dlsym() handles it gracefully. An - * alternate approch consists in calling aligned_alloc() from these places + * alternate approach consists in calling aligned_alloc() from these places * but that would mean not being able to intercept it later if considered * useful to do so. */ @@ -411,7 +411,7 @@ static int cli_parse_set_profiling(char **args, char *payload, struct appctx *ap } if (strcmp(args[2], "tasks") != 0) - return cli_err(appctx, "Expects etiher 'tasks' or 'memory'.\n"); + return cli_err(appctx, "Expects either 'tasks' or 'memory'.\n"); if (strcmp(args[3], "on") == 0) { unsigned int old = profiling; diff --git a/src/haproxy.c b/src/haproxy.c index c13beb487..1fd4a6be6 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -2623,7 +2623,7 @@ void run_poll_loop() int i; if (stopping) { - /* stop muxes before acknowleding stopping */ + /* stop muxes before acknowledging stopping */ if (!(stopping_thread_mask & tid_bit)) { task_wakeup(mux_stopping_data[tid].task, TASK_WOKEN_OTHER); wake = 1;