Merge branch 'master' into sarah.stonehill/code-origin-new-doc

Author: tylfin

content/en/error_tracking/guides/_index.md

@@ -5,7 +5,7 @@ disable_toc: true
 ---
 
 {{< whatsnext desc="Enable other products from a standalone Backend Error Tracking installation:" >}}
-    {{< nextlink href="/error_tracking/guides/enable_infra" >}}Enable infrastructure monitoring{{< /nextlink >}}
-    {{< nextlink href="/error_tracking/guides/enable_apm" >}}Enable APM{{< /nextlink >}}
-    {{< nextlink href="/error_tracking/guides/sentry_sdk" >}} Sentry SDK{{< /nextlink >}}
+    {{< nextlink href="/error_tracking/guides/enable_infra" >}}Enable Infrastructure Monitoring with backend standalone Error Tracking {{< /nextlink >}}
+    {{< nextlink href="/error_tracking/guides/enable_apm" >}}Enable APM with backend standalone Error Tracking{{< /nextlink >}}
+    {{< nextlink href="/error_tracking/guides/sentry_sdk" >}} Enable Sentry SDK with backend standalone Error Tracking{{< /nextlink >}}
 {{< /whatsnext >}}

content/en/error_tracking/guides/sentry_sdk.md

@@ -119,17 +119,13 @@ To configure the Sentry SDK to send events into Datadog:
 
 ### Upload JavaScript source maps
 
-If your frontend JavaScript source code is minified, you can upload source maps to Datadog to deobfuscate stack traces in Error Tracking.
-
-See [Upload JavaScript Source Maps][4].
+If your frontend JavaScript source code is minified, you can upload source maps to Datadog to deobfuscate stack traces in Error Tracking. See [Upload JavaScript Source Maps][4].
 
 The `version` on source maps is matched with the `release` [configured][11] on the Sentry SDK.
 
 ### Source code integration
 
-[Datadog Source Code Integration][5] allows you to connect your telemetry with your Git repositories.
-
-Source Code Integration works with Sentry SDKs by configuring telemetry tags:
+[Datadog Source Code Integration][5] allows you to connect your telemetry with your Git repositories. It works with Sentry SDKs by configuring telemetry tags:
 
 {{< tabs >}}
 
@@ -188,14 +184,16 @@ Sentry.set_tags('git.repository_url', '<git-provider.example/me/my-repo>')
 
 To get the most out of Error Tracking, Datadog recommends migrating to the Datadog SDK and/or Agent-based setups. See [Backend Error Tracking][7] and [Frontend Error Tracking][8] for more information.
 
-During your migration, you can use the Sentry SDK and Datadog at the same time.
+The Sentry SDK setup can be used simultaneously with the recommended setup. Errors may be reported twice.
 
-**Note**: Doing so may result in errors being reported twice.
+## Send events to both Sentry and Datadog
+Events can be sent to both Sentry (or any other Sentry-compatible backend) and Datadog. This allows you to start using Datadog while also keeping your current solution. There are a couple of ways to achieve this:
+- [Using the Sentry SDK](#using-the-sentry-sdk)
+- [Using Sentry Mirror](#using-sentry-mirror)
 
-### From the Sentry SDK
+### Using the Sentry SDK
 You can configure Sentry SDKs to send events to multiple DSNs at once. On most Sentry SDKs, you can override the default transport to achieve this.
 
-
 {{< tabs >}}
 
 {{% tab "JavaScript" %}}

content/en/notebooks/_index.md

@@ -2,6 +2,8 @@
 title: Notebooks
 aliases:
   - /graphing/notebooks/
+  - /notebooks_new/
+  - /notebooks_legacy/
 further_reading:
 - link: "https://www.datadoghq.com/blog/incident-response-templates-notebooks-list/"
   tag: "Blog"

content/en/real_user_monitoring/browser/setup/server/_index.md

@@ -48,10 +48,20 @@ To remotely configure your RUM application:
 
 <div class="alert alert-warning">To request support for a web server that is not listed here, <a href="https://www.datadoghq.com/private-beta/rum-sdk-auto-injection/">fill out this form.</a></div>
 
-Follow the documentation for your web server type to learn more:
+If you don't want to configure your RUM applications remotely, follow the documentation for your web server type to configure your RUM application locally:
 
+<br>
 {{< partial name="rum/rum-browser-setup.html" >}}
+<br>
 
+## Limitations
+
+Keep in mind the following limitations when using this setup:
+
+- This instrumentation method **does not support [advanced RUM configurations][1]**, except for `allowedTracingUrls` and `excludedActivityUrls`.
+- If your web server is acting as a proxy and the upstream server uses **end-to-end encryption (TLS)** or **content compression** (gzip, zstd, Brotli), the RUM Browser SDK **cannot be injected**. To ensure proper instrumentation:
+  - **Disable content compression** on the upstream server.
+  - **Enable TLS origination** on the web server.
 
 ## Further reading
 

content/en/real_user_monitoring/browser/setup/server/apache.md

@@ -4,6 +4,10 @@ beta: true
 code_lang: apache
 type: multi-code-lang
 code_lang_weight: 3
+further_reading:
+- link: '/real_user_monitoring/browser/setup/server/'
+  tag: 'Documentation'
+  text: 'Browser Monitoring Auto-Instrumentation (Server-Side)'
 ---
 
 <div class="alert alert-info">To try the preview for RUM Auto-Instrumentation, follow the instructions on this page.</div>
@@ -12,14 +16,7 @@ code_lang_weight: 3
 
 RUM Auto-Instrumentation works by injecting the RUM Browser SDK into the HTML responses being served through a web server or proxy.
 
-## Limitations
-
-Keep in mind the following limitations when using this setup:
-
-- This instrumentation method **does not support [advanced RUM configurations][1]**, except for `allowedTracingUrls` and `excludedActivityUrls`.
-- If your web server is acting as a proxy and the upstream server uses **end-to-end encryption (TLS)** or **content compression** (gzip, zstd, Brotli), the RUM Browser SDK may **not be injected**. To ensure proper instrumentation:
-  - **Disable content compression** on the upstream server.
-  - **Enable TLS origination** on the web server.
+To understand important limitations and compatibility requirements, see [Limitations][1].
 
 ## Prerequisites
 
@@ -47,6 +44,8 @@ To automatically instrument your RUM application:
 
 {{% collapse-content title="Manual configuration" level="h5" %}}
 
+To manually load the module onto your web server instead of running the installation script, follow the instructions below.
+
 To manually instrument your RUM application:
 
 #### Download the module file
@@ -106,9 +105,15 @@ To update your RUM Application:
 If you notice that RUM is not being injected into HTML pages, consider the following potential causes:
 
 - **Content-Type mismatch**: RUM is injected only into HTML pages. If the `Content-Type` header does not correctly indicate `text/html`, the injection is skipped.
-- **Upstream server has end-to-end encryption or content compression**: See [Limitations](#limitations).
 
-[1]: /real_user_monitoring/browser/advanced_configuration/
+### Limitations
+See other [Limitations][1].
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: /real_user_monitoring/browser/setup/server/#limitations
 [2]: /agent/
 [3]: https://httpd.apache.org/modules/
 [4]: https://app.datadoghq.com/rum/list

content/en/real_user_monitoring/browser/setup/server/ibm.md

@@ -4,6 +4,10 @@ beta: true
 code_lang: ibm
 type: multi-code-lang
 code_lang_weight: 4
+further_reading:
+- link: '/real_user_monitoring/browser/setup/server/'
+  tag: 'Documentation'
+  text: 'Browser Monitoring Auto-Instrumentation (Server-Side)'
 ---
 
 <div class="alert alert-info">To try the preview for RUM Auto-Instrumentation, follow the instructions on this page.</div>
@@ -12,14 +16,7 @@ code_lang_weight: 4
 
 RUM Auto-Instrumentation works by injecting the RUM Browser SDK into the HTML responses being served through a web server or proxy.
 
-## Limitations
-
-Keep in mind the following limitations when using this setup:
-
-- This instrumentation method **does not support [advanced RUM configurations][1]**, except for `allowedTracingUrls` and `excludedActivityUrls`.
-- If your web server is acting as a proxy and the upstream server uses **end-to-end encryption (TLS)** or **content compression** (gzip, zstd, Brotli), the RUM Browser SDK may **not be injected**. To ensure proper instrumentation:
-  - **Disable content compression** on the upstream server.
-  - **Enable TLS origination** on the web server.
+To understand important limitations and compatibility requirements, see [Limitations][1].
 
 ## Prerequisites
 
@@ -50,6 +47,8 @@ To automatically instrument your RUM application:
 
 {{% collapse-content title="Manual configuration" level="h5" %}}
 
+To manually load the module onto your web server instead of running the installation script, follow the instructions below.
+
 To manually instrument your RUM application:
 
 #### Download the module file
@@ -111,9 +110,15 @@ To update your RUM Application:
 If you notice that RUM is not being injected into HTML pages, consider the following potential causes:
 
 - **Content-Type mismatch**: RUM is injected only into HTML pages. If the `Content-Type` header does not correctly indicate `text/html`, the injection is skipped.
-- **Upstream server has end-to-end encryption or content compression**: See [Limitations](#limitations).
 
-[1]: /real_user_monitoring/browser/advanced_configuration/
+### Limitations
+See other [Limitations][1].
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
+
+[1]: /real_user_monitoring/browser/setup/server/#limitations
 [2]: /agent/
 [3]: https://httpd.apache.org/modules/
 [4]: https://rum-auto-instrumentation.s3.amazonaws.com/httpd/latest/mod_datadog-amd64.zip

content/en/real_user_monitoring/browser/setup/server/nginx.md

@@ -4,6 +4,10 @@ beta: true
 code_lang: nginx
 type: multi-code-lang
 code_lang_weight: 5
+further_reading:
+- link: '/real_user_monitoring/browser/setup/server/'
+  tag: 'Documentation'
+  text: 'Browser Monitoring Auto-Instrumentation (Server-Side)'
 ---
 
 <div class="alert alert-info">To try the preview for RUM Auto-Instrumentation, follow the instructions on this page.</div>
@@ -12,14 +16,7 @@ code_lang_weight: 5
 
 RUM Auto-Instrumentation works by injecting the RUM Browser SDK into the HTML responses being served through a web server or proxy.
 
-## Limitations
-
-Keep in mind the following limitations when using this setup:
-
-- This instrumentation method **does not support [advanced RUM configurations][1]**, except for `allowedTracingUrls` and `excludedActivityUrls`.
-- If your web server is acting as a proxy and the upstream server uses **end-to-end encryption (TLS)** or **content compression** (gzip, zstd, Brotli), the RUM Browser SDK may **not be injected**. To ensure proper instrumentation:
-  - **Disable content compression** on the upstream server.
-  - **Enable TLS origination** on the web server.
+To understand important limitations and compatibility requirements, see [Limitations][1].
 
 ## Prerequisites
 
@@ -51,6 +48,8 @@ To automatically instrument your RUM application:
 
 {{% collapse-content title="Manual configuration" level="h5" %}}
 
+To manually load the module onto your web server instead of running the installation script, follow the instructions below.
+
 To manually instrument your RUM application:
 
 #### Download the appropriate `.tgz` file
@@ -122,7 +121,9 @@ Since the module is in Preview, it's possible NGINX may stop serving requests, p
 If you notice that RUM is not being injected into HTML pages, consider the following potential causes:
 
 - **Content-Type mismatch**: RUM is injected only into HTML pages. If the `Content-Type` header does not correctly indicate `text/html`, the injection is skipped.
-- **Upstream server has end-to-end encryption or content compression**: See [Limitations](#limitations).
+
+### Limitations
+See other [Limitations][1].
 
 ## Reference
 
@@ -147,8 +148,11 @@ If you notice that RUM is not being injected into HTML pages, consider the follo
 | 1.27.3 | [ngx_http_datadog-amd64-1.27.3][35] | [ngx_http_datadog-arm64-1.27.3][36] |
 | 1.27.4 | [ngx_http_datadog-amd64-1.27.4][37] | [ngx_http_datadog-arm64-1.27.4][38] |
 
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
 
-[1]: /real_user_monitoring/browser/advanced_configuration/
+[1]: /real_user_monitoring/browser/setup/server/#limitations
 [2]: /agent/
 [3]: https://docs.nginx.com/nginx/admin-guide/dynamic-modules/dynamic-modules/
 [4]: https://app.datadoghq.com/rum/list

content/en/real_user_monitoring/browser/setup/server/windows_iis.md

@@ -4,6 +4,10 @@ beta: true
 code_lang: windows_iis
 type: multi-code-lang
 code_lang_weight: 6
+further_reading:
+- link: '/real_user_monitoring/browser/setup/server/'
+  tag: 'Documentation'
+  text: 'Browser Monitoring Auto-Instrumentation (Server-Side)'
 ---
 
 <div class="alert alert-info">To try the preview for RUM Auto-Instrumentation, follow the instructions on this page.</div>
@@ -12,14 +16,7 @@ code_lang_weight: 6
 
 RUM Auto-Instrumentation works by injecting the RUM Browser SDK into the HTML responses being served through a web server or proxy.
 
-## Limitations
-
-Keep in mind the following limitations when using this setup:
-
-- This instrumentation method **does not support [advanced RUM configurations][1]**, except for `allowedTracingUrls` and `excludedActivityUrls`.
-- If your web server is acting as a proxy and the upstream server uses **end-to-end encryption (TLS)** or **content compression** (gzip, zstd, Brotli), the RUM Browser SDK may **not be injected**. To ensure proper instrumentation:
-  - **Disable content compression** on the upstream server.
-  - **Enable TLS origination** on the web server.
+To understand important limitations and compatibility requirements, see [Limitations][1].
 
 ## Prerequisites
 
@@ -72,10 +69,15 @@ To update your RUM Application:
 If you notice that RUM is not being injected into HTML pages, consider the following potential causes:
 
 - **Content-Type mismatch**: RUM is injected only into HTML pages. If the `Content-Type` header does not correctly indicate `text/html`, the injection is skipped.
-- **Upstream server has end-to-end encryption or content compression**: See [Limitations](#limitations).
 
+### Limitations
+See other [Limitations][1].
+
+## Further reading
+
+{{< partial name="whats-next/whats-next.html" >}}
 
-[1]: /real_user_monitoring/browser/advanced_configuration/
+[1]: /real_user_monitoring/browser/setup/server/#limitations
 [2]: /agent/
 [3]: https://app.datadoghq.com/rum/list/create/
 [4]: /real_user_monitoring/guide/best-practices-for-rum-sampling/