Merge branch 'main' into waf/refactor

Author: ADubhlaoich

.github/pull_request_template.md

@@ -14,7 +14,7 @@
 [//]: # "If the changes were defined by a GitHub issue, reference it using keywords."
 [//]: # "https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests"
 
-[//]: # "Do not like to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
+[//]: # "Do not link to any internal, non-public resources. This includes internal repository issues or anything in an intranet."
 [//]: # "You can make reference to internal discussions without linking to them: see 'Referencing internal information'."
 [//]: # "https://github.com/nginx/documentation/blob/main/documentation/closed-contributions.md#referencing-internal-information"
 

content/nginx/admin-guide/basic-functionality/managing-configuration-files.md

@@ -9,9 +9,9 @@ type:
 - how-to
 ---
 
-NGINX and NGINX Plus are similar to other services in using a text‑based configuration file with a precise format. By default the file is named **nginx.conf** and for NGINX Plus is placed in the `**/etc/nginx**` directory.
+Similar to other services, NGINX and NGINX Plus use a text‑based configuration file with a precise format. By default the file is named **nginx.conf** and for NGINX Plus is placed in the `/etc/nginx` directory.
 
-For NGINX Open Source, the location depends on the package system used to install NGINX and the operating system. It is typically one of `**/usr/local/nginx/conf**`, `**/etc/nginx**`, or `**/usr/local/etc/nginx**`.
+For NGINX Open Source, the location depends on the package system used to install NGINX and the operating system. It is typically one of `/usr/local/nginx/conf`, `/etc/nginx`, or `/usr/local/etc/nginx`.
 
 ## Directives
 The configuration file consists of _directives_ and their parameters. Simple (single‑line) directives end with a semicolon ( `;` ). Other directives act as “containers” which group together related directives. Containers are enclosed in curly braces ( `{}` ) and are often referred to as _blocks_. Here are some examples of simple directives.

content/nic/configuration/global-configuration/configmap-resource.md

@@ -28,7 +28,7 @@ that make sense for your setup:
       client-max-body-size: "2m"
     ```
 
-    See the section [Summary of ConfigMap Keys](#summary-of-configmap-keys) for the explanation of the available ConfigMap keys (such as `proxy-connect-timeout` in this example).
+    See the section [Summary of ConfigMap Keys](#configmap-keys) for the explanation of the available ConfigMap keys (such as `proxy-connect-timeout` in this example).
 
 1. Create a new (or update the existing) ConfigMap resource: