From df3b815286d7b721aa67200f98b746e4a179e795 Mon Sep 17 00:00:00 2001
From: ruthnaebeck <19349244+ruthnaebeck@users.noreply.github.com>
Date: Tue, 21 Jul 2020 15:42:55 -0400
Subject: [PATCH] DOCS-838 Template wording (#7038)

* DOCS-838 Template wording

* file sync

* sync

* jmx.yaml

* http.yaml

* updates

* updates

* updates

* update

* update

* updates

* update

* rebase with master and update openmetrics

* Sync config

Co-authored-by: ChristineTChen <christine.chen@datadoghq.com>
---
 .../activemq_xml/data/conf.yaml.example       |  8 +++---
 .../airflow/data/conf.yaml.example            |  8 +++---
 .../ambari/data/conf.yaml.example             |  8 +++---
 .../apache/data/conf.yaml.example             |  8 +++---
 .../cisco_aci/data/conf.yaml.example          |  4 +--
 .../cloud_foundry_api/data/conf.yaml.example  |  4 +--
 .../consul/data/conf.yaml.example             |  8 +++---
 .../couch/data/conf.yaml.example              |  8 +++---
 .../configuration/instances/http.yaml         |  8 +++---
 .../configuration/instances/openmetrics.yaml  | 19 +++++++-------
 .../druid/data/conf.yaml.example              |  8 +++---
 .../ecs_fargate/data/conf.yaml.example        |  4 +--
 .../elastic/data/conf.yaml.example            |  8 +++---
 .../envoy/data/conf.yaml.example              |  8 +++---
 .../fluentd/data/conf.yaml.example            |  8 +++---
 .../gitlab/data/conf.yaml.example             | 25 +++++++++----------
 .../hdfs_datanode/data/conf.yaml.example      |  8 +++---
 .../hdfs_namenode/data/conf.yaml.example      |  8 +++---
 .../istio/data/conf.yaml.example              | 25 +++++++++----------
 .../kong/data/conf.yaml.example               |  8 +++---
 .../data/conf.yaml.example                    | 25 +++++++++----------
 .../lighttpd/data/conf.yaml.example           |  8 +++---
 .../nginx/data/conf.yaml.example              |  8 +++---
 .../data/conf.yaml.example                    | 25 +++++++++----------
 .../openmetrics/data/conf.yaml.example        | 25 +++++++++----------
 .../spark/data/conf.yaml.example              |  8 +++---
 .../twistlock/data/conf.yaml.example          |  8 +++---
 .../vault/data/conf.yaml.example              |  8 +++---
 28 files changed, 151 insertions(+), 157 deletions(-)

diff --git a/activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example b/activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example
index c06cd21b67c65..4758790eb5c16 100644
--- a/activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example
+++ b/activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example
@@ -85,7 +85,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -221,7 +221,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -231,7 +231,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -251,7 +251,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/airflow/datadog_checks/airflow/data/conf.yaml.example b/airflow/datadog_checks/airflow/data/conf.yaml.example
index 1bab441173ea7..e151003259578 100644
--- a/airflow/datadog_checks/airflow/data/conf.yaml.example
+++ b/airflow/datadog_checks/airflow/data/conf.yaml.example
@@ -56,7 +56,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -192,7 +192,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -202,7 +202,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -222,7 +222,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/ambari/datadog_checks/ambari/data/conf.yaml.example b/ambari/datadog_checks/ambari/data/conf.yaml.example
index 58493e508a2da..547f42e82b11a 100644
--- a/ambari/datadog_checks/ambari/data/conf.yaml.example
+++ b/ambari/datadog_checks/ambari/data/conf.yaml.example
@@ -125,7 +125,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -221,7 +221,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -231,7 +231,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -251,7 +251,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/apache/datadog_checks/apache/data/conf.yaml.example b/apache/datadog_checks/apache/data/conf.yaml.example
index 917f19cda798f..ebc28f8ca3ad8 100644
--- a/apache/datadog_checks/apache/data/conf.yaml.example
+++ b/apache/datadog_checks/apache/data/conf.yaml.example
@@ -56,7 +56,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -192,7 +192,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -202,7 +202,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -222,7 +222,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example b/cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example
index d677b36edbadf..b444bd53572e3 100644
--- a/cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example
+++ b/cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example
@@ -125,7 +125,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -164,7 +164,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/cloud_foundry_api/datadog_checks/cloud_foundry_api/data/conf.yaml.example b/cloud_foundry_api/datadog_checks/cloud_foundry_api/data/conf.yaml.example
index 9b75751a9201f..ed05d630e9551 100644
--- a/cloud_foundry_api/datadog_checks/cloud_foundry_api/data/conf.yaml.example
+++ b/cloud_foundry_api/datadog_checks/cloud_foundry_api/data/conf.yaml.example
@@ -69,7 +69,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -108,7 +108,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/consul/datadog_checks/consul/data/conf.yaml.example b/consul/datadog_checks/consul/data/conf.yaml.example
index 891bee29db90d..df41b9ecd8040 100644
--- a/consul/datadog_checks/consul/data/conf.yaml.example
+++ b/consul/datadog_checks/consul/data/conf.yaml.example
@@ -119,7 +119,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -255,7 +255,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -265,7 +265,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -285,7 +285,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/couch/datadog_checks/couch/data/conf.yaml.example b/couch/datadog_checks/couch/data/conf.yaml.example
index b072554288910..d79148e180198 100644
--- a/couch/datadog_checks/couch/data/conf.yaml.example
+++ b/couch/datadog_checks/couch/data/conf.yaml.example
@@ -131,7 +131,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -257,7 +257,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -267,7 +267,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -287,7 +287,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/http.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/http.yaml
index 0bd529bfa4882..2f9f172c2b2f8 100644
--- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/http.yaml
+++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/http.yaml
@@ -22,7 +22,7 @@
     Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     to specify hosts that must bypass proxies.
 
-    The SOCKS protocol is also supported like so:
+    The SOCKS protocol is also supported, for example:
 
       socks5://user:pass@host:port
 
@@ -159,7 +159,7 @@
   description: |
     If your services require AWS Signature Version 4 signing, set the host.
 
-    Note that this setting is not necessary for official integrations.
+    Note: This setting is not necessary for official integrations.
 
     See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
 - name: aws_service
@@ -169,7 +169,7 @@
     If your services require AWS Signature Version 4 signing, set the service code. For a list
     of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
 
-    Note that this setting is not necessary for official integrations.
+    Note: This setting is not necessary for official integrations.
 
     See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
 - name: tls_verify
@@ -191,7 +191,7 @@
     If `tls_verify` is disabled, security warnings are logged by the check.
     Disable those by setting `tls_ignore_warning` to true.
 
-    Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     to true.
 - name: tls_cert
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml
index 9138d929421f7..f9add3e6f88b4 100644
--- a/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml
+++ b/datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/openmetrics.yaml
@@ -32,8 +32,8 @@
     default: null
 - name: health_service_check
   description: |
-    Send a service check reporting about the health of the prometheus endpoint.
-    It's named <NAMESPACE>.prometheus.health
+    Send a service check reporting about the health of the Prometheus endpoint.
+    The service check is named <NAMESPACE>.prometheus.health
   value:
     type: boolean
     example: true
@@ -44,7 +44,7 @@
     example: <LABEL>
 - name: label_joins
   description: |
-    The label join allows to target a metric and retrieve it's label via a 1:1 mapping.
+    The label join allows to target a metric and retrieve it's label with a 1:1 mapping.
   value:
     example:
       target_metric:
@@ -73,9 +73,8 @@
     type: object
 - name: type_overrides
   description: |
-    Type override allows you to override a type in the prometheus payload
-    or type an untyped metrics (they're ignored by default).
-    Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    Override a type in the Prometheus payload or type an untyped metric (they're ignored by default).
+    Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, and `summary`.
     The "*" wildcard can be used to match multiple metric names.
   value:
     example:
@@ -109,14 +108,14 @@
     type: boolean
 - name: send_distribution_counts_as_monotonic
   description: |
-    Set send_distribution_counts_as_monotonic to true to send histograms & summary
+    Set send_distribution_counts_as_monotonic to true to send histograms and summary
     counters as monotonic counters (instead of gauges).
   value:
     example: false
     type: boolean
 - name: send_distribution_sums_as_monotonic
   description: |
-    Set send_distribution_sums_as_monotonic to true to send histograms & summary
+    Set send_distribution_sums_as_monotonic to true to send histograms and summary
     sum as monotonic counters (instead of gauges).
   value:
     example: false
@@ -138,7 +137,7 @@
     type: boolean
 - name: bearer_token_path
   description: |
-    The path to a kubernetes service account bearer token file, make sure the file exists and mounted correctly.
+    The path to a Kubernetes service account bearer token file. Make sure the file exists and is mounted correctly.
     Note: bearer_token_auth should be set to true to enable adding the token to HTTP headers for authentication.
   value:
     example: <TOKEN_PATH>
@@ -157,4 +156,4 @@
       - <*_SUBSTRING_*>
 
 - template: instances/http
-- template: instances/default
+- template: instances/default
\ No newline at end of file
diff --git a/druid/datadog_checks/druid/data/conf.yaml.example b/druid/datadog_checks/druid/data/conf.yaml.example
index 2d0d1e1f00f1f..ea774f3badb27 100644
--- a/druid/datadog_checks/druid/data/conf.yaml.example
+++ b/druid/datadog_checks/druid/data/conf.yaml.example
@@ -56,7 +56,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -192,7 +192,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -202,7 +202,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -222,7 +222,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example b/ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example
index 8d5d49245ef05..f4dadfb2a7468 100644
--- a/ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example
+++ b/ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example
@@ -155,9 +155,9 @@ instances:
 
     ## @param tls_ignore_warning - boolean - optional - default: false
     ## If `tls_verify` is disabled, security warnings are logged by the check.
-    ## Disable those by setting `tls_ignore_warning` to true.
+    ## Disable these by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/elastic/datadog_checks/elastic/data/conf.yaml.example b/elastic/datadog_checks/elastic/data/conf.yaml.example
index 6c39a5e23865e..024f1a46bc638 100644
--- a/elastic/datadog_checks/elastic/data/conf.yaml.example
+++ b/elastic/datadog_checks/elastic/data/conf.yaml.example
@@ -139,7 +139,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -275,7 +275,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -285,7 +285,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -305,7 +305,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/envoy/datadog_checks/envoy/data/conf.yaml.example b/envoy/datadog_checks/envoy/data/conf.yaml.example
index 3bac0884c7b32..56996c2b35947 100644
--- a/envoy/datadog_checks/envoy/data/conf.yaml.example
+++ b/envoy/datadog_checks/envoy/data/conf.yaml.example
@@ -144,7 +144,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -270,7 +270,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -280,7 +280,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -300,7 +300,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/fluentd/datadog_checks/fluentd/data/conf.yaml.example b/fluentd/datadog_checks/fluentd/data/conf.yaml.example
index dc383a50202e0..b97e4b16193ee 100644
--- a/fluentd/datadog_checks/fluentd/data/conf.yaml.example
+++ b/fluentd/datadog_checks/fluentd/data/conf.yaml.example
@@ -109,7 +109,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -245,7 +245,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -255,7 +255,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -275,7 +275,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/gitlab/datadog_checks/gitlab/data/conf.yaml.example b/gitlab/datadog_checks/gitlab/data/conf.yaml.example
index 5c453ae2775c6..5bfd57da2b410 100644
--- a/gitlab/datadog_checks/gitlab/data/conf.yaml.example
+++ b/gitlab/datadog_checks/gitlab/data/conf.yaml.example
@@ -26,8 +26,8 @@ instances:
     # prometheus_metrics_prefix: <PREFIX>_
 
     ## @param health_service_check - boolean - optional - default: true
-    ## Send a service check reporting about the health of the prometheus endpoint.
-    ## It's named <NAMESPACE>.prometheus.health
+    ## Send a service check reporting about the health of the Prometheus endpoint.
+    ## The service check is named <NAMESPACE>.prometheus.health
     #
     # health_service_check: true
 
@@ -37,7 +37,7 @@ instances:
     # label_to_hostname: <LABEL>
 
     ## @param label_joins - mapping - optional
-    ## The label join allows to target a metric and retrieve it's label via a 1:1 mapping.
+    ## The label join allows to target a metric and retrieve it's label with a 1:1 mapping.
     #
     # label_joins:
     #   target_metric:
@@ -54,9 +54,8 @@ instances:
     #   flavor: origin
 
     ## @param type_overrides - mapping - optional
-    ## Type override allows you to override a type in the prometheus payload
-    ## or type an untyped metrics (they're ignored by default).
-    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## Override a type in the Prometheus payload or type an untyped metric (they're ignored by default).
+    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, and `summary`.
     ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
@@ -80,13 +79,13 @@ instances:
     send_monotonic_counter: true
 
     ## @param send_distribution_counts_as_monotonic - boolean - optional - default: true
-    ## Set send_distribution_counts_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_counts_as_monotonic to true to send histograms and summary
     ## counters as monotonic counters (instead of gauges).
     #
     send_distribution_counts_as_monotonic: true
 
     ## @param send_distribution_sums_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_sums_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_sums_as_monotonic to true to send histograms and summary
     ## sum as monotonic counters (instead of gauges).
     #
     # send_distribution_sums_as_monotonic: false
@@ -104,7 +103,7 @@ instances:
     # bearer_token_auth: false
 
     ## @param bearer_token_path - string - optional
-    ## The path to a kubernetes service account bearer token file, make sure the file exists and mounted correctly.
+    ## The path to a Kubernetes service account bearer token file. Make sure the file exists and is mounted correctly.
     ## Note: bearer_token_auth should be set to true to enable adding the token to HTTP headers for authentication.
     #
     # bearer_token_path: <TOKEN_PATH>
@@ -125,7 +124,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -261,7 +260,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -271,7 +270,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -291,7 +290,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example b/hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example
index 288a8d4c62172..b7021fe6b713f 100644
--- a/hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example
+++ b/hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example
@@ -62,7 +62,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -198,7 +198,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -208,7 +208,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -228,7 +228,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/hdfs_namenode/datadog_checks/hdfs_namenode/data/conf.yaml.example b/hdfs_namenode/datadog_checks/hdfs_namenode/data/conf.yaml.example
index be0a50a075c6b..0625e6083756a 100644
--- a/hdfs_namenode/datadog_checks/hdfs_namenode/data/conf.yaml.example
+++ b/hdfs_namenode/datadog_checks/hdfs_namenode/data/conf.yaml.example
@@ -62,7 +62,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -198,7 +198,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -208,7 +208,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -228,7 +228,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/istio/datadog_checks/istio/data/conf.yaml.example b/istio/datadog_checks/istio/data/conf.yaml.example
index 3a8bfde4e080e..0812e21eb7e7f 100644
--- a/istio/datadog_checks/istio/data/conf.yaml.example
+++ b/istio/datadog_checks/istio/data/conf.yaml.example
@@ -95,8 +95,8 @@ instances:
     # prometheus_metrics_prefix: <PREFIX>_
 
     ## @param health_service_check - boolean - optional - default: true
-    ## Send a service check reporting about the health of the prometheus endpoint.
-    ## It's named <NAMESPACE>.prometheus.health
+    ## Send a service check reporting about the health of the Prometheus endpoint.
+    ## The service check is named <NAMESPACE>.prometheus.health
     #
     # health_service_check: true
 
@@ -106,7 +106,7 @@ instances:
     # label_to_hostname: <LABEL>
 
     ## @param label_joins - mapping - optional
-    ## The label join allows to target a metric and retrieve it's label via a 1:1 mapping.
+    ## The label join allows to target a metric and retrieve it's label with a 1:1 mapping.
     #
     # label_joins:
     #   target_metric:
@@ -123,9 +123,8 @@ instances:
     #   flavor: origin
 
     ## @param type_overrides - mapping - optional
-    ## Type override allows you to override a type in the prometheus payload
-    ## or type an untyped metrics (they're ignored by default).
-    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## Override a type in the Prometheus payload or type an untyped metric (they're ignored by default).
+    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, and `summary`.
     ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
@@ -149,13 +148,13 @@ instances:
     # send_monotonic_counter: true
 
     ## @param send_distribution_counts_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_counts_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_counts_as_monotonic to true to send histograms and summary
     ## counters as monotonic counters (instead of gauges).
     #
     # send_distribution_counts_as_monotonic: false
 
     ## @param send_distribution_sums_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_sums_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_sums_as_monotonic to true to send histograms and summary
     ## sum as monotonic counters (instead of gauges).
     #
     # send_distribution_sums_as_monotonic: false
@@ -173,7 +172,7 @@ instances:
     # bearer_token_auth: false
 
     ## @param bearer_token_path - string - optional
-    ## The path to a kubernetes service account bearer token file, make sure the file exists and mounted correctly.
+    ## The path to a Kubernetes service account bearer token file. Make sure the file exists and is mounted correctly.
     ## Note: bearer_token_auth should be set to true to enable adding the token to HTTP headers for authentication.
     #
     # bearer_token_path: <TOKEN_PATH>
@@ -194,7 +193,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -330,7 +329,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -340,7 +339,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -360,7 +359,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/kong/datadog_checks/kong/data/conf.yaml.example b/kong/datadog_checks/kong/data/conf.yaml.example
index b160e2943d272..2deae231e6dc9 100644
--- a/kong/datadog_checks/kong/data/conf.yaml.example
+++ b/kong/datadog_checks/kong/data/conf.yaml.example
@@ -56,7 +56,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -192,7 +192,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -202,7 +202,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -222,7 +222,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example
index 34e20f695060f..4e78df4c86bde 100644
--- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example
+++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/data/conf.yaml.example
@@ -63,8 +63,8 @@ instances:
     # prometheus_metrics_prefix: <PREFIX>_
 
     ## @param health_service_check - boolean - optional - default: true
-    ## Send a service check reporting about the health of the prometheus endpoint.
-    ## It's named <NAMESPACE>.prometheus.health
+    ## Send a service check reporting about the health of the Prometheus endpoint.
+    ## The service check is named <NAMESPACE>.prometheus.health
     #
     # health_service_check: true
 
@@ -74,7 +74,7 @@ instances:
     # label_to_hostname: <LABEL>
 
     ## @param label_joins - mapping - optional
-    ## The label join allows to target a metric and retrieve it's label via a 1:1 mapping.
+    ## The label join allows to target a metric and retrieve it's label with a 1:1 mapping.
     #
     # label_joins:
     #   target_metric:
@@ -91,9 +91,8 @@ instances:
     #   flavor: origin
 
     ## @param type_overrides - mapping - optional
-    ## Type override allows you to override a type in the prometheus payload
-    ## or type an untyped metrics (they're ignored by default).
-    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## Override a type in the Prometheus payload or type an untyped metric (they're ignored by default).
+    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, and `summary`.
     ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
@@ -117,13 +116,13 @@ instances:
     # send_monotonic_counter: true
 
     ## @param send_distribution_counts_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_counts_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_counts_as_monotonic to true to send histograms and summary
     ## counters as monotonic counters (instead of gauges).
     #
     # send_distribution_counts_as_monotonic: false
 
     ## @param send_distribution_sums_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_sums_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_sums_as_monotonic to true to send histograms and summary
     ## sum as monotonic counters (instead of gauges).
     #
     # send_distribution_sums_as_monotonic: false
@@ -141,7 +140,7 @@ instances:
     # bearer_token_auth: true
 
     ## @param bearer_token_path - string - optional
-    ## The path to a kubernetes service account bearer token file, make sure the file exists and mounted correctly.
+    ## The path to a Kubernetes service account bearer token file. Make sure the file exists and is mounted correctly.
     ## Note: bearer_token_auth should be set to true to enable adding the token to HTTP headers for authentication.
     #
     # bearer_token_path: <TOKEN_PATH>
@@ -162,7 +161,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -298,7 +297,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -308,7 +307,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -328,7 +327,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/lighttpd/datadog_checks/lighttpd/data/conf.yaml.example b/lighttpd/datadog_checks/lighttpd/data/conf.yaml.example
index d3fc34d6cfd5c..2e04647bf2051 100644
--- a/lighttpd/datadog_checks/lighttpd/data/conf.yaml.example
+++ b/lighttpd/datadog_checks/lighttpd/data/conf.yaml.example
@@ -56,7 +56,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -192,7 +192,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -202,7 +202,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -222,7 +222,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/nginx/datadog_checks/nginx/data/conf.yaml.example b/nginx/datadog_checks/nginx/data/conf.yaml.example
index 21a9b7f4c710e..92aa9a5f1a3d1 100644
--- a/nginx/datadog_checks/nginx/data/conf.yaml.example
+++ b/nginx/datadog_checks/nginx/data/conf.yaml.example
@@ -85,7 +85,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -221,7 +221,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -231,7 +231,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -251,7 +251,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example
index 54ae6d0230197..ab27958ff1e46 100644
--- a/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example
+++ b/nginx_ingress_controller/datadog_checks/nginx_ingress_controller/data/conf.yaml.example
@@ -64,8 +64,8 @@ instances:
     # prometheus_metrics_prefix: <PREFIX>_
 
     ## @param health_service_check - boolean - optional - default: true
-    ## Send a service check reporting about the health of the prometheus endpoint.
-    ## It's named <NAMESPACE>.prometheus.health
+    ## Send a service check reporting about the health of the Prometheus endpoint.
+    ## The service check is named <NAMESPACE>.prometheus.health
     #
     # health_service_check: true
 
@@ -75,7 +75,7 @@ instances:
     # label_to_hostname: <LABEL>
 
     ## @param label_joins - mapping - optional
-    ## The label join allows to target a metric and retrieve it's label via a 1:1 mapping.
+    ## The label join allows to target a metric and retrieve it's label with a 1:1 mapping.
     #
     # label_joins:
     #   target_metric:
@@ -92,9 +92,8 @@ instances:
     #   flavor: origin
 
     ## @param type_overrides - mapping - optional
-    ## Type override allows you to override a type in the prometheus payload
-    ## or type an untyped metrics (they're ignored by default).
-    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## Override a type in the Prometheus payload or type an untyped metric (they're ignored by default).
+    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, and `summary`.
     ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
@@ -118,13 +117,13 @@ instances:
     # send_monotonic_counter: true
 
     ## @param send_distribution_counts_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_counts_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_counts_as_monotonic to true to send histograms and summary
     ## counters as monotonic counters (instead of gauges).
     #
     # send_distribution_counts_as_monotonic: false
 
     ## @param send_distribution_sums_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_sums_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_sums_as_monotonic to true to send histograms and summary
     ## sum as monotonic counters (instead of gauges).
     #
     # send_distribution_sums_as_monotonic: false
@@ -142,7 +141,7 @@ instances:
     # bearer_token_auth: false
 
     ## @param bearer_token_path - string - optional
-    ## The path to a kubernetes service account bearer token file, make sure the file exists and mounted correctly.
+    ## The path to a Kubernetes service account bearer token file. Make sure the file exists and is mounted correctly.
     ## Note: bearer_token_auth should be set to true to enable adding the token to HTTP headers for authentication.
     #
     # bearer_token_path: <TOKEN_PATH>
@@ -163,7 +162,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -299,7 +298,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -309,7 +308,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -329,7 +328,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example
index 1e894080cabd1..eb5b12cbf8d2b 100644
--- a/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example
+++ b/openmetrics/datadog_checks/openmetrics/data/conf.yaml.example
@@ -70,8 +70,8 @@ instances:
     # prometheus_metrics_prefix: <PREFIX>_
 
     ## @param health_service_check - boolean - optional - default: true
-    ## Send a service check reporting about the health of the prometheus endpoint.
-    ## It's named <NAMESPACE>.prometheus.health
+    ## Send a service check reporting about the health of the Prometheus endpoint.
+    ## The service check is named <NAMESPACE>.prometheus.health
     #
     # health_service_check: true
 
@@ -81,7 +81,7 @@ instances:
     # label_to_hostname: <LABEL>
 
     ## @param label_joins - mapping - optional
-    ## The label join allows to target a metric and retrieve it's label via a 1:1 mapping.
+    ## The label join allows to target a metric and retrieve it's label with a 1:1 mapping.
     #
     # label_joins:
     #   target_metric:
@@ -98,9 +98,8 @@ instances:
     #   flavor: origin
 
     ## @param type_overrides - mapping - optional
-    ## Type override allows you to override a type in the prometheus payload
-    ## or type an untyped metrics (they're ignored by default).
-    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, `summary`
+    ## Override a type in the Prometheus payload or type an untyped metric (they're ignored by default).
+    ## Supported <METRIC_TYPE> are `gauge`, `counter`, `histogram`, and `summary`.
     ## The "*" wildcard can be used to match multiple metric names.
     #
     # type_overrides:
@@ -124,13 +123,13 @@ instances:
     # send_monotonic_counter: true
 
     ## @param send_distribution_counts_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_counts_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_counts_as_monotonic to true to send histograms and summary
     ## counters as monotonic counters (instead of gauges).
     #
     # send_distribution_counts_as_monotonic: false
 
     ## @param send_distribution_sums_as_monotonic - boolean - optional - default: false
-    ## Set send_distribution_sums_as_monotonic to true to send histograms & summary
+    ## Set send_distribution_sums_as_monotonic to true to send histograms and summary
     ## sum as monotonic counters (instead of gauges).
     #
     # send_distribution_sums_as_monotonic: false
@@ -148,7 +147,7 @@ instances:
     # bearer_token_auth: false
 
     ## @param bearer_token_path - string - optional
-    ## The path to a kubernetes service account bearer token file, make sure the file exists and mounted correctly.
+    ## The path to a Kubernetes service account bearer token file. Make sure the file exists and is mounted correctly.
     ## Note: bearer_token_auth should be set to true to enable adding the token to HTTP headers for authentication.
     #
     # bearer_token_path: <TOKEN_PATH>
@@ -169,7 +168,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -305,7 +304,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -315,7 +314,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -335,7 +334,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/spark/datadog_checks/spark/data/conf.yaml.example b/spark/datadog_checks/spark/data/conf.yaml.example
index 4f0abebfba625..65e3e18a85f81 100644
--- a/spark/datadog_checks/spark/data/conf.yaml.example
+++ b/spark/datadog_checks/spark/data/conf.yaml.example
@@ -144,7 +144,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -280,7 +280,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -290,7 +290,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -310,7 +310,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/twistlock/datadog_checks/twistlock/data/conf.yaml.example b/twistlock/datadog_checks/twistlock/data/conf.yaml.example
index 3baba769555be..6e6ab678da8a6 100644
--- a/twistlock/datadog_checks/twistlock/data/conf.yaml.example
+++ b/twistlock/datadog_checks/twistlock/data/conf.yaml.example
@@ -62,7 +62,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -198,7 +198,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -208,7 +208,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -228,7 +228,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #
diff --git a/vault/datadog_checks/vault/data/conf.yaml.example b/vault/datadog_checks/vault/data/conf.yaml.example
index 5395427972d42..2701400454331 100644
--- a/vault/datadog_checks/vault/data/conf.yaml.example
+++ b/vault/datadog_checks/vault/data/conf.yaml.example
@@ -77,7 +77,7 @@ instances:
     ## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
     ## to specify hosts that must bypass proxies.
     ##
-    ## The SOCKS protocol is also supported like so:
+    ## The SOCKS protocol is also supported, for example:
     ##
     ##   socks5://user:pass@host:port
     ##
@@ -213,7 +213,7 @@ instances:
     ## @param aws_host - string - optional
     ## If your services require AWS Signature Version 4 signing, set the host.
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -223,7 +223,7 @@ instances:
     ## If your services require AWS Signature Version 4 signing, set the service code. For a list
     ## of available service codes, see https://docs.aws.amazon.com/general/latest/gr/rande.html
     ##
-    ## Note that this setting is not necessary for official integrations.
+    ## Note: This setting is not necessary for official integrations.
     ##
     ## See https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
@@ -243,7 +243,7 @@ instances:
     ## If `tls_verify` is disabled, security warnings are logged by the check.
     ## Disable those by setting `tls_ignore_warning` to true.
     ##
-    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration. 
+    ## Note: `tls_ignore_warning` set to true is currently only reliable if used by one instance of one integration.
     ## If enabled for multiple instances, spurious warnings might still appear even if `tls_ignore_warning` is set
     ## to true.
     #