docs: resolve merge conflict in toc.yml for PR #314406

Upstream added 'Azure Data Explorer connector' entry while the PR
removed unrelated entries (Log Analytics, managed identity, config
deletion). Kept the new upstream entry alongside the PR's removals.

Co-authored-by: Copilot <[email protected]>

Author: craigshoemaker

articles/api-management/azure-openai-token-limit-policy.md

@@ -9,7 +9,7 @@ ms.collection: ce-skilling-ai-copilot
 ms.custom:
   - build-2024
 ms.topic: reference
-ms.date: 11/10/2025
+ms.date: 04/01/2026
 ms.update-cycle: 180-days
 ms.author: danlep
 ---
@@ -49,8 +49,8 @@ By relying on token usage metrics returned from the Azure OpenAI endpoint, the p
 | -------------- | ----------------------------------------------------------------------------------------------------- | -------- | ------- |
 | counter-key          | The key to use for the token limit policy. For each key value, a single counter is used for all scopes at which the policy is configured. Policy expressions are allowed.| Yes      | N/A     |
 | tokens-per-minute | The maximum number of tokens consumed by prompt and completion per minute.         | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified.      | N/A     |
-| token-quota | The maximum number of tokens allowed during the time interval specified in the `token-quota-period`. Policy expressions aren't allowed. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified. | N/A |
-| token-quota-period | The length of the fixed window after which the `token-quota` resets. The value must be one of the following: `Hourly`,`Daily`, `Weekly`, `Monthly`, `Yearly`. The start time of a quota period is calculated using the UTC timestamp truncated to the unit (hour, day, etc.) used for the period. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified.     | N/A |
+| token-quota | The maximum number of tokens allowed during the time interval specified in the `token-quota-period`. Policy expressions are allowed. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified. | N/A |
+| token-quota-period | The length of the fixed window after which the `token-quota` resets. The value must be one of the following: `Hourly`,`Daily`, `Weekly`, `Monthly`, `Yearly`. The start time of a quota period is calculated using the UTC timestamp truncated to the unit (hour, day, etc.) used for the period. Policy expressions are allowed. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified.     | N/A |
 | estimate-prompt-tokens | Boolean value that determines whether to estimate the number of tokens required for a prompt: <br> - `true`: estimate the number of tokens based on prompt schema in API; may reduce performance. <br> - `false`: don't estimate prompt tokens. <br><br>When set to `false`, the remaining tokens per `counter-key` are calculated using the actual token usage from the response of the model. This could result in prompts being sent to the model that exceed the token limit. In such case, this will be detected in the response, and all succeeding requests will be blocked by the policy until the token limit resets.  | Yes       | N/A     |
 | retry-after-header-name    | The name of a custom response header whose value is the recommended retry interval in seconds after the specified `tokens-per-minute` or `token-quota` is exceeded. Policy expressions aren't allowed. |  No | `Retry-After`  |
 | retry-after-variable-name    | The name of a variable that stores the recommended retry interval in seconds after the specified `tokens-per-minute` or `token-quota` is exceeded. Policy expressions aren't allowed. |  No | N/A  |

articles/api-management/llm-token-limit-policy.md

@@ -8,7 +8,7 @@ ms.service: azure-api-management
 ms.collection: ce-skilling-ai-copilot
 ms.custom:
 ms.topic: reference
-ms.date: 11/17/2025
+ms.date: 04/01/2026
 ms.update-cycle: 180-days
 ms.author: danlep
 ---
@@ -48,9 +48,9 @@ By relying on token usage metrics returned from the LLM endpoint, the policy mon
 | -------------- | ----------------------------------------------------------------------------------------------------- | -------- | ------- |
 | counter-key          | The key to use for the token limit policy. For each key value, a single counter is used for all scopes at which the policy is configured. Policy expressions are allowed.| Yes      | N/A     |
 | tokens-per-minute | The maximum number of tokens consumed by prompt and completion per minute.         | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified.      | N/A     |
-| token-quota | The maximum number of tokens allowed during the time interval specified in the `token-quota-period`. Policy expressions aren't allowed. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified. | N/A |
-| token-quota-period | The length of the fixed window after which the `token-quota` resets. The value must be one of the following: `Hourly`,`Daily`, `Weekly`, `Monthly`, `Yearly`. The start time of a quota period is calculated as the UTC timestamp truncated to the unit (hour, day, etc.) used for the period.  | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified.   | N/A |
-| estimate-prompt-tokens | Boolean value that determines whether to estimate the number of tokens required for a prompt: <br> - `true`: estimate the number of tokens based on prompt schema in API; may reduce performance. <br> - `false`: don't estimate prompt tokens. <br><br>When set to `false`, the remaining tokens per `counter-key` are calculated using the actual token usage from the response of the model. This could result in prompts being sent to the model that exceed the token limit. In such case, this will be detected in the response, and all succeeding requests will be blocked by the policy until the token limit resets.  | Yes       | N/A     |
+| token-quota | The maximum number of tokens allowed during the time interval specified in the `token-quota-period`. Policy expressions are allowed. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified. | N/A |
+| token-quota-period | The length of the fixed window after which the `token-quota` resets. The value must be one of the following: `Hourly`,`Daily`, `Weekly`, `Monthly`, `Yearly`. The start time of a quota period is calculated as the UTC timestamp truncated to the unit (hour, day, etc.) used for the period. Policy expressions are allowed. | Either a rate limit (`tokens-per-minute`), a quota (`token-quota` over a `token-quota-period`), or both must be specified.   | N/A |
+| estimate-prompt-tokens | Boolean value that determines whether to estimate the number of tokens required for a prompt: <br> - `true`: estimate the number of tokens based on prompt schema in API; may reduce performance. <br> - `false`: don't estimate prompt tokens. <br><br>When set to `false`, the remaining tokens per `counter-key` are calculated using the actual token usage from the response of the model. This could result in prompts being sent to the model that exceed the token limit. In such case, this will be detected in the response, and all succeeding requests will be blocked by the policy until the token limit resets. | Yes       | N/A     |
 | retry-after-header-name    | The name of a custom response header whose value is the recommended retry interval in seconds after the specified `tokens-per-minute` or `token-quota` is exceeded. Policy expressions aren't allowed. |  No | `Retry-After`  |
 | retry-after-variable-name    | The name of a variable that stores the recommended retry interval in seconds after the specified `tokens-per-minute` or `token-quota` is exceeded. Policy expressions aren't allowed. |  No | N/A  |
 | remaining-quota-tokens-header-name | The name of a response header whose value after each policy execution is the estimated number of remaining tokens corresponding to `token-quota` allowed for the `token-quota-period`. Policy expressions aren't allowed. | No | N/A |

articles/app-service/configure-sidecar.md

@@ -12,6 +12,9 @@ ms.service: azure-app-service
 
 This article provides practical steps for enabling and configuring sidecars in your App Service app.
 
+> [!IMPORTANT]
+> Because sidecars share the same network namespace and environment as your main app, only run trusted code and container images as sidecars.
+
 ## Create a sidecar in the Azure portal
 
 1. Go to your App Service resource in the Azure portal.

articles/app-service/overview-sidecar.md

@@ -25,6 +25,10 @@ Sidecars enable you to add new capabilities, such as monitoring, caching, AI, or
 
 - **Container roles:** Each sidecar-enabled app has one main container (`isMain: true`) and up to nine sidecar containers (`isMain: false`). In the container configuration, `isMain: true` designates the main app container. All others must have `isMain: false`.
 - **Networking:** All containers in the app share the same network namespace and communicate over `localhost`. There is no need for service name resolution, so use `localhost:<port>`. Each container must listen on a unique port. Only ports 80 and 8080 are supported for external HTTP traffic. For internal communication, use any available unique port.
+
+> [!IMPORTANT]
+> Because sidecars share the same network namespace and environment as your main app, only run trusted code and container images as sidecars.
+
 - **Lifecycle:** Sidecars start, stop, and scale together with the main app container. When your app scales out or in, all associated sidecar containers follow the same lifecycle automatically.
 - **Configuration:** Sidecars can be configured via the Azure portal, ARM templates, or CLI. You specify the container image, environment variables, and other settings for each container. App settings are shared across all containers. You can also set container-specific environment variables.
 - **Volume mounts:** Each container can have its own volume mounts.

articles/artifact-signing/quickstart.md

@@ -245,7 +245,7 @@ To create an identity validation request for an Organization or a DBA:
     | **Organization Name**          | For public identity validation, provide the legal business entity to which the certificate is issued. For private identity validation, the value defaults to your Microsoft Entra tenant name. |
     | **(Private Identity Type only) Organizational Unit**          | Enter the relevant information. |
     | **Website url**          | Enter the website that belongs to the legal business entity. |
-    | **Primary Email**           | Enter the email address of an individual (distribution lists aren't accepted) associated with the legal business entity undergoing validation. Part of the Identity Validation process, a verification link is sent to this email address and the link expires in seven days. Ensure that the email address can receive emails(with links) from external email addresses.  |
+    | **Primary Email**           | Enter the email address associated with the legal business entity undergoing validation. Part of the Identity Validation process, a verification link is sent to this email address and the link expires in seven days. Ensure that the email address can receive emails(with links) from external email addresses.  |
     | **Secondary Email**          | This email address must be different from the primary email address (distribution lists are accepted). For organizations, the domain must match the email address that is provided in the primary email address. Ensure that the email address can receive emails from external email addresses that have links.|
     | **Business Identifier**           | Enter a business identifier for the legal business entity. |
     | **Seller ID**          | Applies only to Microsoft Store customers. Find your Seller ID in the Partner Center portal. |
@@ -277,7 +277,7 @@ To create an identity validation request for an Organization or a DBA:
 | Accuracy             | Ensure that you provide the correct information for public identity validation. If you need to make any changes after it's created, you must complete a new identity validation request. This change affects the associated certificates that are being used for signing. |
 | Failed email verification            | If email verification fails, you must initiate a new identity validation request. |
 | Identity validation status            | You're notified through email when there's an update to the identity validation status. You can also check the status in the Azure portal at any time. |
-| Processing time            | Processing your identity validation request takes from 1 to 30 business days (possibly longer if we need to request more documentation from you). |
+| Processing time            | Processing your identity validation request takes from 1 to 20 business days (possibly longer if we need to request more documentation from you). |
 | More documentation            | If we need more documentation to process the identity validation request, you're notified through email. You can upload the documents in the Azure portal. For documentation upload, there are three attempts. The documentation request email contains information about file size requirements. Ensure that any documents you provide are the most current. <br> - All documents submitted must be issued within the previous 12 months and where the expiration date is a future date that is at least two months away. <br>  - If it isn't possible to provide additional documentation, update your account information to match any legal documents already provided or your official Company registration details. <br>  - When providing official business document, such as business registration form, business charter, or articles of incorporation that list the company name and address as it is provided at the time of Identity Validation request creation. <br>  - Ensure the domain registration or domain invoice from registration or renewal that lists the entity and contact name and all the domains that are included/mentioned in the request.|
 
 # [Identity Validation - Individual Developer](#tab/indiedevvalidation)

articles/automation/automation-use-azure-ad.md

@@ -49,7 +49,7 @@ For Azure Automation to communicate with Microsoft Entra ID, you must retrieve t
 
 ## Create a credential asset
 
-With the Azure credentials for Microsoft Entra available, it's time to create an Azure Automation credential asset to securely store the Microsoft Entra credentials so that runbooks and Desire State Configuration (DSC) scripts can access them. You can do this using either the Azure portal or PowerShell cmdlets.
+With the Azure credentials for Microsoft Entra available, it's time to create an Azure Automation credential asset to securely store the Microsoft Entra credentials so that runbooks and Desired State Configuration (DSC) scripts can access them. You can do this using either the Azure portal or PowerShell cmdlets.
 
 ### Create the credential asset in Azure portal
 

articles/azure-app-configuration/TOC.yml

@@ -348,7 +348,7 @@
     - name: Enable geo-replication
       href: howto-geo-replication.md
   - name: Reliability in App Configuration
-    href: /azure/reliability/reliability-app-configuration.md?bc=/azure/bread/toc.json&toc=/azure/app-service/toc.json
+    href: /azure/reliability/reliability-app-configuration?bc=/azure/bread/toc.json&toc=/azure/azure-app-configuration/TOC.json
   - name: Resiliency and disaster recovery
     href: concept-disaster-recovery.md
   - name: Availability zone support

articles/azure-cache-for-redis/TOC.yml

@@ -35,17 +35,21 @@
     items:
     - name: Overview
       href: /azure/redis/migrate/migrate-basic-standard-premium-overview
-    - name: Understand
+    - name: Understand differences
       href: /azure/redis/migrate/migrate-basic-standard-premium-understand
-    - name: Self-service
+    - name: Explore migration options
+      href: /azure/redis/migrate/migrate-basic-standard-premium-options
+    - name: Self-service migration
       href: /azure/redis/migrate/migrate-basic-standard-premium-self-service
+    - name: Migration using tooling
+      href: /azure/redis/migrate/migrate-basic-standard-premium-with-tooling
   - name: Migrate Enterprise tier to Azure Managed Redis
     items:
     - name: Overview
       href: /azure/redis/migrate/migrate-redis-enterprise-overview
-    - name: Understand
+    - name: Understand differences
       href: /azure/redis/migrate/migrate-redis-enterprise-understand
-    - name: Self-service
+    - name: Self-service migration
       href: /azure/redis/migrate/migrate-redis-enterprise-self-service
   - name: Migrate to Azure Redis from other caches
     href: cache-migration-guide.md

articles/azure-cache-for-redis/cache-whats-new.md

@@ -15,6 +15,10 @@ appliesto:
 
 Find out what's new in Azure Redis.
 
+## April 2026
+
+### Tooling to migrate Azure Cache for Redis instance to Azure Managed Redis (preview)
+Tooling to aid migration from Azure Cache for Redis (Basic, Standard, and Premium) is now available in Public Preview. When migration is initiated using the tooling, your Azure Cache for Redis endpoint is updated to point to your precreated Azure Managed Redis. For more information, see [Migration using tooling](/azure/redis/migrate/migrate-basic-standard-premium-with-tooling).
 
 ## October 2025