Merge branch 'master' into mcretzman/fix-build-crash-caused-by-redirects

Author: michaelcretzman

content/en/administrators_guide/plan.md

@@ -366,7 +366,7 @@ Create a detailed roll-out methodology in the [build][41] phase by focusing on t
 [48]: https://www.datadoghq.com/blog/engineering/husky-deep-dive/
 [49]: /real_user_monitoring/platform/connect_rum_and_traces/?tab=browserrum
 [50]: /integrations/tcp_check/?tab=host#data-collected
-[51]: /tracing/guide/inferred-service-opt-in/?tab=java
+[51]: /tracing/services/inferred_services
 [52]: /integrations/amazon_web_services/
 [53]: /integrations/google_cloud_platform/
 [54]: /integrations/azure/

content/en/service_catalog/customize/_index.md

@@ -142,7 +142,7 @@ With [Service Catalog metadata schema 2.2][5], you can specify the type and lang
 [4]: https://forms.gle/zbLfnJYhD5Ab4Wr18
 [5]: https://github.com/DataDog/schema/tree/main/service-catalog/v2.2
 [6]: /actions/actions_catalog/
-[7]: /tracing/guide/inferred-service-opt-in/?tab=java#global-default-service-naming-migration
+[7]: /tracing/services/inferred_services
 [8]: /tracing/guide/service_overrides/#remove-service-overrides
 [9]: /tracing/guide/service_overrides/
 [10]: /service_catalog/service_definitions/#add-metadata-with-automation

content/en/tracing/guide/inferred-service-opt-in.md

@@ -2,9 +2,9 @@
 title: Service Overrides
 disable_toc: false
 further_reading:
-- link: "/tracing/guide/inferred-service-opt-in"
+- link: "/tracing/services/inferred_services"
   tag: "Documentation"
-  text: "Opting-in to the new service representation"
+  text: "Inferred services"
 ---
 
 ## Overview
@@ -140,9 +140,9 @@ The default `DD_SERVICE` name.
 
 {{< partial name="whats-next/whats-next.html" >}}
 
-[1]: /tracing/guide/inferred-service-opt-in
+[1]: /tracing/services/inferred_services
 [2]: /tracing/trace_pipeline/generate_metrics
 [3]: /monitors/types/apm/?tab=traceanalytics
 [4]: /tracing/trace_pipeline/trace_retention/#retention-filters
 [5]: /tracing/metrics/metrics_namespace/
-[6]: https://docs.datadoghq.com/tracing/guide/inferred-service-opt-in/#list-of-newly-introduced-peer-tags
+[6]: /tracing/services/inferred_services/#peer-tags

content/en/tracing/guide/service_overrides.md

@@ -1,5 +1,7 @@
 ---
 title: Inferred services
+aliases:
+  - /tracing/guide/inferred-service-opt-in
 further_reading:
 - link: "/tracing/services/service_page/"
   tag: "Documentation"

content/en/tracing/services/inferred_services.md

@@ -30,9 +30,9 @@ further_reading:
 - link: '/integrations/'
   tag: 'Documentation'
   text: "Datadog's full list of integrations"
-- link: '/tracing/guide/inferred-service-opt-in/'
+- link: '/tracing/services/inferred_services'
   tag: 'Documentation'
-  text: 'Inferred Service dependencies (Preview)'
+  text: 'Inferred Service dependencies'
 ---
 
 If you experience unexpected behavior while using Datadog APM, read the information on this page to help resolve the issue. Datadog recommends regularly updating to the latest version of the Datadog tracing libraries you use, as each release contains improvements and fixes. If you continue to experience issues, reach out to [Datadog support][1].
@@ -372,7 +372,7 @@ When you open a [support ticket][1], the Datadog support team may ask for the fo
 [27]: /tracing/trace_collection/library_config/
 [28]: https://app.datadoghq.com/dash/integration/apm_estimated_usage
 [29]: /tracing/troubleshooting/#data-volume-guidelines
-[30]: /tracing/guide/inferred-service-opt-in/?tab=java
+[30]: /tracing/services/inferred_services
 [31]: /tracing/trace_pipeline/metrics/#apm-traces-estimated-usage-dashboard
 [32]: https://app.datadoghq.com/services