Merge branch 'main' of github.com:splunk/private-o11y-docs

Author: theletterf

_includes/gdi/zero-conf-reqs.rst

@@ -6,5 +6,5 @@
 
    - To get an access token, see :ref:`admin-api-access-tokens`.
 
-   - To find the realm name of your account, open the navigation menu in Splunk Observability Cloud. Select :menuselection:`Settings`, and then select your username. The realm name appears in the :guilabel:`Organizations` section.
+   - To find the realm name of your account, see :ref:`Note about realms <about-realms>`.
 

_includes/realm-note.rst

@@ -1,6 +1,5 @@
 .. note:: Note about realms
 
-   A realm is a self-contained deployment of Splunk Observability Cloud in which your organization is hosted. Different realms have different API endpoints. For example, the endpoint for sending data in the ``us1`` realm is ``https://ingest.us1.signalfx.com``, while the endpoint for sending data in the ``eu0`` realm is
-   ``https://ingest.eu0.signalfx.com``.
+   A realm is a self-contained deployment of Splunk Observability Cloud in which your organization is hosted. Different realms have different API endpoints. For example, the endpoint for sending data in the ``us1`` realm is ``https://ingest.us1.signalfx.com``, while the endpoint for sending data in the ``eu0`` realm is ``https://ingest.eu0.signalfx.com``.
 
-   When you see a placeholder realm name in the documentation, such as ``<YOUR_REALM>``, replace it with your actual realm name. To find your realm name, open the left navigation menu in Observability Cloud, select :menuselection:`Settings`, and select your username. The realm name appears in the :guilabel:`Organizations` section. If you don't include the realm name when specifying an endpoint, Observability Cloud defaults to the ``us0`` realm.
+   When you see a placeholder realm name in the documentation, such as ``<YOUR_REALM>``, replace it with your actual realm name. To find your realm name, open the navigation menu in Splunk Observability Cloud, select :menuselection:`Settings`, and select your username. The realm name appears in the :guilabel:`Organizations` section. If you don't include the realm name when specifying an endpoint, Splunk Observability Cloud defaults to the ``us0`` realm.

_includes/requirements/php.rst

@@ -1,9 +1,3 @@
-The SignalFx Tracing Library for PHP supports PHP version 7.0 or higher running on the Zend engine.
+The OpenTelemetry instrumentation for PHP supports PHP version 8.0 or higher.
 
-Supported web servers are:
-
-- Apache
-- php-fpm
-- php-cli
-
-.. note:: The library is not compatible with Windows environments.
+.. note:: The library is not supported for Windows environments.

_static/custom.css

@@ -309,3 +309,7 @@ a.external:not(.image-reference):after {
    background-size: contain;
    display: inline-block;
 }
+
+.relations{
+    display: none !important;
+}

_templates/404.html

@@ -175,7 +175,7 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
                                   </select>
                                 </p>
                                 <p>
-                                  <label for="signalfx_splunk_feedback_email">Enter your email address, and someone from the documentation team will respond to you:</label>
+                                  <label for="signalfx_splunk_feedback_email">Enter your email address if you would like someone from the documentation team to reply to your question or suggestion.</label>
                                                             </p>  <p>	<input  name="signalfx_splunk_feedback_email" id="signalfx_splunk_feedback_email" type="text" maxlength="255" size="30" value="" required/>
                                 </p>
                                 <p>

_templates/layout.html

@@ -166,7 +166,7 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
                                   </select>
                                 </p>
                                 <p>
-                                  <label for="signalfx_splunk_feedback_email">Enter your email address, and someone from the documentation team will respond to you:</label>
+                                  <label for="signalfx_splunk_feedback_email">Enter your email address if you would like someone from the documentation team to reply to your question or suggestion.</label>
                                                             </p>  <p>	<input  name="signalfx_splunk_feedback_email" id="signalfx_splunk_feedback_email" type="text" maxlength="255" size="30" value="" required/>
                                 </p>
                                 <p>

_templates/search.html

@@ -240,7 +240,7 @@ <h2 style="font-size:21px;font-family: 'Open Sans'; font-weight: bold;">Was this
                     </select>
                 </p>
                 <p>
-                    <label for="signalfx_splunk_feedback_email">Enter your email address, and someone from the documentation team will respond to you:</label>
+                    <label for="signalfx_splunk_feedback_email">Enter your email address if you would like someone from the documentation team to reply to your question or suggestion.</label>
                 </p>  <p>	<input  name="signalfx_splunk_feedback_email" id="signalfx_splunk_feedback_email" type="text" maxlength="255" size="30" value="" required/>
             </p>
                 <p>

admin/authentication/SSO/sso.rst

@@ -12,9 +12,9 @@ Configure SSO integrations for Splunk Observability Cloud
 Splunk Observability Cloud provides SSO login service integrations that let your users log in using a third-party
 identity provider (IdP) that uses SAML SSO. Observability Cloud supports SSO initiated by the IdP.
 
-Observability Cloud also supports SSO initiated by Observability Cloud, and this option lets your users log in to Infrastructure Monitoring using a custom URL you specify.
+Splunk Observability Cloud also supports SSO initiated by Observability Cloud, and this option lets your users log in to Infrastructure Monitoring using a custom URL you specify.
 
-Observability Cloud supports the following SSO integrations:
+Splunk Observability Cloud supports the following SSO integrations:
 
 -  :ref:`Splunk Cloud Platform<unified-id-unified-identity>`
 -  :ref:`Microsoft Active Directory Federation Services (ADFS)<sso-adfs>`

admin/subscription-usage/analyze-apm-billing-usage.rst

@@ -23,13 +23,13 @@ To view your organization's APM subscription usage, go to :guilabel:`Settings` t
 How APM calculates usage
 ========================
 
-APM uses Splunk Observability Cloud metrics to calculate usage for traces analyzed per minute (TAPM) and host subscription plans. Entitlements for host subscription plans are based on the number of hosts and containers sending data to APM. Entitlements for TAPM subscription plans are based on the number of traces you send to APM per minute.
+APM uses Splunk Observability Cloud metrics to calculate usage for traces-analyzed-per-minute (TAPM) and host subscription plans. Entitlements for host subscription plans are based on the number of hosts and containers sending data to APM. Entitlements for TAPM subscription plans are based on the number of traces you send to APM per minute.
 
 As a result, the metrics for calculating usage depend on the subscription plan type. See the following sections for more information about how APM calculates usage for each subscription plan type. To confirm the plan for your organization, view the :guilabel:`Subscription` panel on the Subscription Usage page.
 
 To see all of the organization metrics for APM, see :ref:`Usage metrics for Splunk Observability Cloud <org-metrics>`.
 
-To see the usage charts and metrics for your subscription plan, go to :guilabel:`Settings > Subscription Usage` and select the :strong:`APM` tab. Depending on your org subscription model, this might be :guilabel:`Settings > Billing and Usage`. The following sections detail the metrics for TAPM and host subscription plans respectively.
+To see the usage charts and metrics for your subscription plan, go to :guilabel:`Settings` then  :guilabel:`Subscription Usage` and select the :strong:`APM` tab. Depending on your org subscription model, this might be :guilabel:`Settings` then :guilabel:`Billing and Usage`. The following sections detail the metrics for TAPM and host subscription plans respectively.
 
 .. _tapm_subscription_plans:
 
@@ -94,23 +94,11 @@ The following metrics power the charts in your APM Subscription Usage page with
 How APM calculates usage 
 ==========================
 
-APM provides a value for each usage metric the system collects for each subscription usage period. The billed value is the higher of these metric values:
-
-- The average per-minute usage throughout the usage period.
-
-- 50% of the peak usage for the usage period.
+APM provides a value for each usage metric the system collects for each subscription usage period. The billed value is the average per-minute usage throughout the usage period.
 
 Every chart on the APM Billing and Usage page plots these metrics so you can monitor the billed value for each metric.
 
-The detailed usage report for each usage period provides the billed value for each usage metric. The following example illustrates how the billed value is based on the higher value of the usage metrics for a usage period:
-
-.. code-block:: none
-
-   # The billed TAPM value for this month is: 47064
-
-   # The average TAPM value for this month is: 31516
-
-   # The halfpeak TAPM value for this month is: 47064
+The detailed usage report for each usage period provides the billed value for each usage metric.
 
 For more information about APM usage reports, see :ref:`view-apm-billing-reports`.
 

admin/subscription-usage/apm-billing-usage-index.rst

@@ -37,7 +37,7 @@ The Subscription Usage page explains the following information about your organi
 How APM calculates usage
 =========================================
 
-APM calculates per-minute usage for your subscription plan. There are two types of subscription plans: :strong:`host` and :strong:`traces analyzed per minute (TAPM)`. To learn more about how APM monitors billing and usage for each subscription plan type, see :ref:`analyze-apm-billing-usage`.
+APM calculates per-minute usage for your subscription plan. There are 2 types of subscription plans: :strong:`host` and :strong:`traces analyzed per minute (TAPM)`. To learn more about how APM monitors billing and usage for each subscription plan type, see :ref:`analyze-apm-billing-usage`.
 
 For each subscription plan type, download detailed usage reports for recent usage periods. Reports break down usage for each minute in a usage period and provide the following type of information: