diff --git a/cmd/otelcol/config/collector/agent_config.yaml b/cmd/otelcol/config/collector/agent_config.yaml
index 7964c306d3..67e2a9f189 100644
--- a/cmd/otelcol/config/collector/agent_config.yaml
+++ b/cmd/otelcol/config/collector/agent_config.yaml
@@ -156,7 +156,8 @@ exporters:
     endpoint: "${SPLUNK_GATEWAY_URL}:4317"
     tls:
       insecure: true
-  # Debug
+  # This component has been deprecated by the "debug" exporter,
+  # which will be adopted in a future release.
   debug:
     verbosity: detailed
 
diff --git a/cmd/otelcol/config/collector/full_config_linux.yaml b/cmd/otelcol/config/collector/full_config_linux.yaml
index aa15beda6a..a1874a05ea 100644
--- a/cmd/otelcol/config/collector/full_config_linux.yaml
+++ b/cmd/otelcol/config/collector/full_config_linux.yaml
@@ -528,8 +528,9 @@ exporters:
   file:
     path: ./filename.json
 
-  # Enables the logging exporter
-  # Full configuration here: https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/loggingexporter
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   # NOTE: This exporter is very helpful in troubleshooting issues
   debug:
     verbosity: detailed
diff --git a/cmd/otelcol/config/collector/gateway_config.yaml b/cmd/otelcol/config/collector/gateway_config.yaml
index 6a55ab6aea..b4f24c3181 100644
--- a/cmd/otelcol/config/collector/gateway_config.yaml
+++ b/cmd/otelcol/config/collector/gateway_config.yaml
@@ -107,8 +107,9 @@ exporters:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
     realm: "${SPLUNK_REALM}"
     sync_host_metadata: true
-  # Debug
-  #debug:
+  # This component has been deprecated by the "debug" exporter,
+  # which will be adopted in a future release.
+  # logging:
     #verbosity: detailed
   # Logs
   splunk_hec:
diff --git a/cmd/otelcol/config/collector/otlp_config_linux.yaml b/cmd/otelcol/config/collector/otlp_config_linux.yaml
index 7778fb703f..2fe98383ba 100644
--- a/cmd/otelcol/config/collector/otlp_config_linux.yaml
+++ b/cmd/otelcol/config/collector/otlp_config_linux.yaml
@@ -84,7 +84,9 @@ exporters:
   signalfx:
     access_token: "${SPLUNK_ACCESS_TOKEN}"
     realm: "${SPLUNK_REALM}"
-  # Debug
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   #debug:
     #verbosity: detailed
 
diff --git a/cmd/otelcol/config/collector/upstream_agent_config.yaml b/cmd/otelcol/config/collector/upstream_agent_config.yaml
index 25d60fed62..87879843d2 100644
--- a/cmd/otelcol/config/collector/upstream_agent_config.yaml
+++ b/cmd/otelcol/config/collector/upstream_agent_config.yaml
@@ -147,7 +147,9 @@ exporters:
     endpoint: "${SPLUNK_GATEWAY_URL}:4317"
     tls:
       insecure: true
-  # Debug
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: detailed
 
diff --git a/deployments/salt/templates/agent_config.yaml b/deployments/salt/templates/agent_config.yaml
index cea5d05a23..8d213d5c12 100644
--- a/deployments/salt/templates/agent_config.yaml
+++ b/deployments/salt/templates/agent_config.yaml
@@ -25,6 +25,9 @@ processors:
     limit_mib: ${SPLUNK_MEMORY_LIMIT_MIB}
 
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   logging/debug:
     verbosity: detailed
   logging/info:
diff --git a/examples/prometheusexec-migration/otel-collector-config-with-exec.yaml b/examples/prometheusexec-migration/otel-collector-config-with-exec.yaml
index 7ef97577ad..637937f3c0 100644
--- a/examples/prometheusexec-migration/otel-collector-config-with-exec.yaml
+++ b/examples/prometheusexec-migration/otel-collector-config-with-exec.yaml
@@ -6,6 +6,9 @@ receivers:
 processors:
   batch:
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: Detailed
 service:
diff --git a/examples/prometheusexec-migration/otel-collector-config-without-exec.yaml b/examples/prometheusexec-migration/otel-collector-config-without-exec.yaml
index bc92bcb55d..21d6a59560 100644
--- a/examples/prometheusexec-migration/otel-collector-config-without-exec.yaml
+++ b/examples/prometheusexec-migration/otel-collector-config-without-exec.yaml
@@ -9,6 +9,9 @@ receivers:
 processors:
   batch:
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: Detailed
 service:
diff --git a/examples/redis/otel-collector-config.yaml b/examples/redis/otel-collector-config.yaml
index 869fd3738b..34b92f5c2f 100644
--- a/examples/redis/otel-collector-config.yaml
+++ b/examples/redis/otel-collector-config.yaml
@@ -20,6 +20,9 @@ exporters:
     # to configure, see https://github:com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter
     access_token: ${SPLUNK_ACCESS_TOKEN}
     realm: "${SPLUNK_REALM}"
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: detailed
 service:
diff --git a/examples/signalfxgatewayprometheusremotewritereceiver/otel-collector-config.yaml b/examples/signalfxgatewayprometheusremotewritereceiver/otel-collector-config.yaml
index 58816836d5..c1068db22b 100644
--- a/examples/signalfxgatewayprometheusremotewritereceiver/otel-collector-config.yaml
+++ b/examples/signalfxgatewayprometheusremotewritereceiver/otel-collector-config.yaml
@@ -13,6 +13,9 @@ exporters:
     # to configure, see https://github:com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter
     access_token: "${SPLUNK_ACCESS_TOKEN}"
     realm: "${SPLUNK_REALM}"
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: Detailed
 service:
diff --git a/internal/configconverter/testdata/ballast_mem_limiter.yaml b/internal/configconverter/testdata/ballast_mem_limiter.yaml
index 1d044607c6..c9bc086645 100644
--- a/internal/configconverter/testdata/ballast_mem_limiter.yaml
+++ b/internal/configconverter/testdata/ballast_mem_limiter.yaml
@@ -13,6 +13,9 @@ processors:
     spike_limit_mib: 800
     ballast_size_mib: 64
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: normal
     sampling_initial: 2
diff --git a/internal/configconverter/testdata/ballast_mem_limiter_custom.yaml b/internal/configconverter/testdata/ballast_mem_limiter_custom.yaml
index b6bb71e3dc..66884ca906 100644
--- a/internal/configconverter/testdata/ballast_mem_limiter_custom.yaml
+++ b/internal/configconverter/testdata/ballast_mem_limiter_custom.yaml
@@ -13,6 +13,9 @@ processors:
     spike_limit_mib: 800
     ballast_size_mib: 64
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: normal
     sampling_initial: 2
diff --git a/internal/receiver/databricksreceiver/testdata/example.yaml b/internal/receiver/databricksreceiver/testdata/example.yaml
index 05505b0e04..e26fd29056 100644
--- a/internal/receiver/databricksreceiver/testdata/example.yaml
+++ b/internal/receiver/databricksreceiver/testdata/example.yaml
@@ -5,6 +5,9 @@ receivers:
     token: abc123
     collection_interval: 10s
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: normal
   signalfx:
diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/internal/testdata/otel-collector-config.yaml b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/internal/testdata/otel-collector-config.yaml
index 6e05b0f939..baff93d503 100644
--- a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/internal/testdata/otel-collector-config.yaml
+++ b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/internal/testdata/otel-collector-config.yaml
@@ -10,6 +10,9 @@ exporters:
     # to configure, see https://github:com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/signalfxexporter
     access_token: "${SPLUNK_ACCESS_TOKEN}"
     realm: "${SPLUNK_REALM}"
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: detailed
 service:
diff --git a/tests/receivers/discovery/testdata/k8s_observer_smart_agent_redis_config.yaml b/tests/receivers/discovery/testdata/k8s_observer_smart_agent_redis_config.yaml
index 04e1a7d2d1..06da321665 100644
--- a/tests/receivers/discovery/testdata/k8s_observer_smart_agent_redis_config.yaml
+++ b/tests/receivers/discovery/testdata/k8s_observer_smart_agent_redis_config.yaml
@@ -46,6 +46,9 @@ processors:
         key: scrape_timestamp
 
 exporters:
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
     verbosity: detailed
   otlp:
diff --git a/tests/receivers/smartagent/collectd-solr/testdata/all_metrics_config.yaml b/tests/receivers/smartagent/collectd-solr/testdata/all_metrics_config.yaml
index d4f65537ca..02913c67cc 100644
--- a/tests/receivers/smartagent/collectd-solr/testdata/all_metrics_config.yaml
+++ b/tests/receivers/smartagent/collectd-solr/testdata/all_metrics_config.yaml
@@ -11,7 +11,9 @@ exporters:
     endpoint: "${OTLP_ENDPOINT}"
     tls:
       insecure: true
-
+  # Debug exporter
+  # If using version 0.85 or lower of the Collector
+  # replace 'debug' with 'logging'
   debug:
 
 service: