Merge pull request #1644 from splunk/repo-sync

Pulling refs/heads/main into main

_includes/gdi/auto-discovery-intro.rst

@@ -1,3 +1,5 @@
-Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. Auto discovery of services is only available for the Collector in Linux and Kubernetes environments. 
+Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. 
 
-With automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`.
+.. caution:: Auto discovery of third-party services is only available for the Collector in Linux and Kubernetes environments. 
+
+Via automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`.

gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst

@@ -1,7 +1,7 @@
 .. _discovery-kubernetes:
 
 ************************************************************************
-Automatic discovery for Kubernetes
+Automatic discovery and zero-code instrumentation for Kubernetes
 ************************************************************************
 
 .. meta:: 
@@ -34,7 +34,7 @@ Automatic discovery for Kubernetes
 
     <h2>Get started</h2>
 
-To enable the Collector's zero-code instrumentation of back-end applications written in Java, Node.js, and .NET see :ref:`k8s-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. 
+To enable zero-code instrumentation of Java, Node.js, and .NET applications running on Kubernetes via auto discovery see :ref:`k8s-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. 
 
 To use the Collector's automatic discovery of third-party applications in Kubernetes environments see :ref:`k8s-third-party`. With this option you'll only have to reuse a config file automatically generated by the Collector. 
 

gdi/opentelemetry/automatic-discovery/discovery-linux.rst

@@ -1,7 +1,7 @@
 .. _discovery-linux:
 
 ************************************************************************
-Automatic discovery for Linux
+Automatic discovery and zero-code instrumentation for Linux
 ************************************************************************
 
 .. meta:: 
@@ -33,7 +33,7 @@ Automatic discovery for Linux
 
     <h2>Get started</h2>
 
-To enable the Collector's zero-code instrumentation of back-end applications written in Java, Node.js, and .NET see :ref:`linux-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. 
+To enable zero-code instrumentation of Java, Node.js, and .NET applications running on Linux via auto discovery see :ref:`linux-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. 
 
 To use the Collector's automatic discovery and configuration of third-party applications in Linux environments see :ref:`linux-third-party`. With this option you'll only have to reuse a config file automatically generated by the Collector. 
 

gdi/opentelemetry/automatic-discovery/discovery-windows.rst

@@ -1,7 +1,7 @@
 .. _discovery-windows:
 
 ************************************************************************
-Automatic discovery for Windows
+Automatic discovery and zero-code instrumentation for Windows
 ************************************************************************
 
 .. meta:: 
@@ -12,8 +12,6 @@ Automatic discovery for Windows
 
     Language runtimes <windows/windows-backend>
 
-
-
 .. raw:: html
 
    <div class="include-start" id="gdi/auto-discovery-intro.rst"></div>
@@ -24,13 +22,11 @@ Automatic discovery for Windows
 
    <div class="include-stop" id="gdi/auto-discovery-intro.rst"></div>
 
-
-
-
 .. raw:: html
 
     <h2>Get started</h2>
 
-The Collector for Windows does not support automatic discovery of third-party services.
+To enable zero-code instrumentation of .NET applications running on Windows via auto discovery see :ref:`windows-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. 
+
+.. note:: The Collector for Windows does not support automatic discovery of third-party services.
 
-To enable the Collector's zero-code instrumentation of back-end applications written in .NET see :ref:`windows-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately.