Merge branch 'MicrosoftDocs:main' into master

Author: albecker1

articles/active-directory/external-identities/tenant-restrictions-v2.md

@@ -368,6 +368,8 @@ Tenant restrictions v2 policies can't be directly enforced on non-Windows 10, Wi
 
 ### Migrate tenant restrictions v1 policies to v2
 
+Migration of Tenant Restrictions from V1 to V2 is an one time operation. Once you have moved from TRv1 to TRv2 on proxy, no client side changes are required and any policy changes need to just happen on the cloud via Entra portal.
+
 On your corporate proxy, you can move from tenant restrictions v1 to tenant restrictions v2 by changing this tenant restrictions v1 header:
 
 `Restrict-Access-To-Tenants: <allowed-tenant-list>`

articles/ai-services/translator/create-translator-resource.md

@@ -1,7 +1,7 @@
 ---
 title: Create a Translator resource
 titleSuffix: Azure AI services
-description: This article shows you how to create an Azure AI Translator resource.
+description: Learn how to create an Azure AI Translator resource and retrieve your API key and endpoint URL in the Azure portal.
 services: cognitive-services
 author: laujan
 ms.author: lajanuar
@@ -13,45 +13,47 @@ ms.date: 09/06/2023
 
 # Create a Translator resource
 
-In this article, you learn how to create a Translator resource in the Azure portal. [Azure AI Translator](translator-overview.md) is a cloud-based machine translation service that is part of the [Azure AI services](../what-are-ai-services.md) family. Azure resources are instances of services that you create. All API requests to Azure AI services require an **endpoint** URL and a read-only **key** for authenticating access.
+In this article, you learn how to create a Translator resource in the Azure portal. [Azure AI Translator](translator-overview.md) is a cloud-based machine translation service that is part of the [Azure AI services](../what-are-ai-services.md) family. Azure resources are instances of services that you create. All API requests to Azure AI services require an *endpoint* URL and a read-only *key* for authenticating access.
 
 ## Prerequisites
 
-To get started, you need an active [**Azure account**](https://azure.microsoft.com/free/cognitive-services/).  If you don't have one, you can [**create a free 12-month subscription**](https://azure.microsoft.com/free/).
+To get started, you need an active [**Azure account**](https://azure.microsoft.com/free/cognitive-services/). If you don't have one, you can [**create a free 12-month subscription**](https://azure.microsoft.com/free/).
 
 ## Create your resource
 
-The Translator service can be accessed through two different resource types:
+With your Azure account, you can access the Translator service through two different resource types:
 
 * [**Single-service**](https://portal.azure.com/#create/Microsoft.CognitiveServicesTextTranslation) resource types enable access to a single service API key and endpoint.
 
-* [**Multi-service**](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource types enable access to multiple Azure AI services using a single API key and endpoint.
+* [**Multi-service**](https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne) resource types enable access to multiple Azure AI services by using a single API key and endpoint.
 
 ## Complete your project and instance details
 
+After you decide which resource type you want use to access the Translator service, you can enter the details for your project and instance.
+
 1. **Subscription**. Select one of your available Azure subscriptions.
 
 1. **Resource Group**. You can create a new resource group or add your resource to a pre-existing resource group that shares the same lifecycle, permissions, and policies.
 
 1. **Resource Region**. Choose **Global** unless your business or application requires a specific region. If you're planning on using the Document Translation feature with [managed identity authorization](document-translation/how-to-guides/create-use-managed-identities.md), choose a geographic region such as **East US**.
 
-1. **Name**. Enter the name you have chosen for your resource. The name you choose must be unique within Azure.
+1. **Name**. Enter a name for your resource. The name you choose must be unique within Azure.
 
    > [!NOTE]
-   > If you are using a Translator feature that requires a custom domain endpoint, such as Document Translation, the value that you enter in the Name field will be the custom domain name parameter for the endpoint.
+   > If you're using a Translator feature that requires a custom domain endpoint, such as Document Translation, the value that you enter in the Name field will be the custom domain name parameter for the endpoint.
 
 1. **Pricing tier**. Select a [pricing tier](https://azure.microsoft.com/pricing/details/cognitive-services/translator) that meets your needs:
 
    * Each subscription has a free tier.
    * The free tier has the same features and functionality as the paid plans and doesn't expire.
-   * Only one free tier is available per subscription.
-   * Document Translation is supported in paid tiers. The Language Studio only supports the S1 or D3 instance tiers. We suggest you select the Standard S1 instance tier to try Document Translation.
+   * Only one free tier resource is available per subscription.
+   * Document Translation is supported in paid tiers. The Language Studio only supports the S1 or D3 instance tiers. If you just want to try Document Translation, select the Standard S1 instance tier.
 
-1. If you've created a multi-service resource, you need to confirm more usage details via the check boxes.
+1. If you've created a multi-service resource, the links at the bottom of the **Basics** tab provides technical documentation regarding the appropriate operation of the service.
 
 1. Select **Review + Create**.
 
-1. Review the service terms and select **Create** to deploy your resource.
+1. Review the service terms, and select **Create** to deploy your resource.
 
 1. After your resource has successfully deployed, select **Go to resource**.
 
@@ -61,15 +63,17 @@ All Azure AI services API requests require an endpoint URL and a read-only key f
 
 * **Authentication keys**. Your key is a unique string that is passed on every request to the Translation service. You can pass your key through a query-string parameter or by specifying it in the HTTP request header.
 
-* **Endpoint URL**. Use the Global endpoint in your API request unless you need a specific Azure region or custom endpoint. *See* [Base URLs](reference/v3-0-reference.md#base-urls). The Global endpoint URL is `api.cognitive.microsofttranslator.com`.
+* **Endpoint URL**. Use the Global endpoint in your API request unless you need a specific Azure region or custom endpoint. For more information, see [Base URLs](reference/v3-0-reference.md#base-urls). The Global endpoint URL is `api.cognitive.microsofttranslator.com`.
 
 ## Get your authentication keys and endpoint
 
-1. After your new resource deploys, select **Go to resource** or navigate directly to your resource page.
-1. In the left rail, under *Resource Management*, select **Keys and Endpoint**.
-1. Copy and paste your keys and endpoint URL in a convenient location, such as *Microsoft Notepad*.
+To authenitcate your connection to your Translator resource, you'll need to find its keys and endpoint.
+
+1. After your new resource deploys, select **Go to resource** or go to your resource page.
+1. In the left navigation pane, under **Resource Management**, select **Keys and Endpoint**.
+1. Copy and paste your keys and endpoint URL in a convenient location, such as Notepad.
 
-:::image type="content" source="media/keys-and-endpoint-resource.png" alt-text="Get key and endpoint.":::
+:::image type="content" source="media/keys-and-endpoint-resource.png" alt-text="Screenshot of the Azure portal showing the Keys and Endpoint page of a Translator resource. The keys and endpoints are highlighted.":::
 
 ## Create a Text Translation client
 
@@ -95,31 +99,29 @@ Text Translation supports both [global and regional endpoints](#complete-your-pr
 >
 > Deleting a resource group also deletes all resources contained in the group.
 
-To remove an Azure AI multi-service or Translator resource, you can **delete the resource** or **delete the resource group**.
-
 To delete the resource:
 
-1. Navigate to your Resource Group in the Azure portal.
+1. Search and select **Resource groups** in the Azure portal, and select your resource group.
 1. Select the resources to be deleted by selecting the adjacent check box.
 1. Select **Delete** from the top menu near the right edge.
-1. Type *yes* in the **Deleted Resources** dialog box.
+1. Enter *delete* in the **Delete Resources** dialog box.
 1. Select **Delete**.
 
 To delete the resource group:
 
-1. Navigate to your Resource Group in the Azure portal.
-1. Select the **Delete resource group** from the top menu bar near the left edge.
+1. Go to your Resource Group in the Azure portal.
+1. Select **Delete resource group** from the top menu bar.
 1. Confirm the deletion request by entering the resource group name and selecting **Delete**.
 
-## How to get started with Translator
+## How to get started with Azure AI Translator REST APIs
 
 In our quickstart, you learn how to use the Translator service with REST APIs.
 
 > [!div class="nextstepaction"]
 > [Get Started with Translator](quickstart-text-rest-api.md)
 
-## More resources
+## Next Steps
 
-* [Microsoft Translator code samples](https://github.com/MicrosoftTranslator).  Multi-language Translator code samples are available on GitHub.
+* [Microsoft Translator code samples](https://github.com/MicrosoftTranslator). Multi-language Translator code samples are available on GitHub.
 * [Microsoft Translator Support Forum](https://www.aka.ms/TranslatorForum)
 * [Get Started with Azure (3-minute video)](https://azure.microsoft.com/get-started/?b=16.24)

articles/ai-services/translator/media/keys-and-endpoint-resource.png

@@ -5,7 +5,7 @@ services: cdn
 author: duongau
 ms.service: azure-cdn
 ms.topic: overview
-ms.date: 06/05/2023
+ms.date: 10/09/2023
 ms.author: duau
 ms.custom: mvc
 
@@ -46,6 +46,7 @@ The following table compares the features available with each product.
 | [Query string caching](cdn-query-string.md)  | **✓** |**✓** |**✓** |**✓** |
 | IPv4/IPv6 dual-stack | **✓** |**✓** |**✓** |**✓** |
 | [HTTP/2 support](cdn-http2.md)  | **✓** |**✓** |**✓** |**✓** |
+| [Routing preference unmetered](../virtual-network/ip-services/routing-preference-unmetered.md)  | |**✓** |**✓** |**✓** |
 ||||
  **Security** | **Standard Microsoft** | **Standard Akamai** | **Standard Edgio** | **Premium Edgio** |
 | HTTPS support with CDN endpoint | **✓** |**✓** |**✓** |**✓** |

articles/cdn/cdn-features.md

@@ -2,17 +2,22 @@
 title: Event Domains in Azure Event Grid
 description: This article describes how to use event domains to manage the flow of custom events to your various business organizations, customers, or applications.
 ms.topic: conceptual
-ms.date: 11/17/2022
+ms.date: 10/09/2023
 ---
 
 # Understand event domains for managing Event Grid topics
-An event domain is a management tool for large number of Event Grid topics related to the same application. You can think of it as a meta-topic that can have thousands of individual topics. It allows an event publisher to publish events to thousands of topics at the same time. Domains also give you authentication and authorization control over each topic so you can partition your tenants. This article describes how to use event domains to manage the flow of custom events to your various business organizations, customers, or applications. Use event domains to:
+An event domain is a management tool for large number of Event Grid topics related to the same application. You can think of it as a meta-topic that can have thousands of individual topics. It provides one publishing endpoint for all the topics in the domain. When publishing an event, the publisher must specify the target topic in the domain to which it wants to publish. The publisher can send an array or a batch of events where events are sent to different topics in the domain. See the [Publishing events to an event domain](#publishing-to-an-event-domain) section for details. 
+
+Domains also give you authentication and authorization control over each topic so you can partition your tenants. This article describes how to use event domains to manage the flow of custom events to your various business organizations, customers, or applications. Use event domains to:
 
 * Manage multitenant eventing architectures at scale.
 * Manage your authentication and authorization.
 * Partition your topics without managing each individually.
 * Avoid individually publishing to each of your topic endpoints.
 
+> [!NOTE]
+> Event domain is not intended to support broadcast scenario where an event is sent to a domain and each topic in the domain receives a copy of the event. When publishing events, the publisher must specify the target topic in the domain to which it wants to publish. If the publisher wants to publish the same event payload to multiple topics in the domain, the publisher needs to duplicate the event payload, and change the topic name, and publish them to Event Grid using the domain endpoint, either individually or as a batch.
+
 ## Example use case
 [!INCLUDE [domain-example-use-case.md](./includes/domain-example-use-case.md)]
 
@@ -33,11 +38,15 @@ Subscribing to events for a topic within an event domain is the same as [creatin
 
 ### Domain scope subscriptions
 
-Event domains also allow for domain-scope subscriptions. An event subscription on an event domain will receive all events sent to the domain regardless of the topic the events are sent to. Domain scope subscriptions can be useful for management and auditing purposes.
+Event domains also allow for domain-scope subscriptions. An event subscription on an event domain receives all events sent to the domain regardless of the topic the events are sent to. Domain scope subscriptions can be useful for management and auditing purposes.
 
 ## Publishing to an event domain
 
-When you create an event domain, you're given a publishing endpoint similar to if you had created a topic in Event Grid. To publish events to any topic in an event domain, push the events to the domain's endpoint the [same way you would for a custom topic](./post-to-custom-topic.md). The only difference is that you must specify the topic you'd like the event to be delivered to. For example, publishing the following array of events would send event with `"id": "1111"` to topic `foo` while the event with `"id": "2222"` would be sent to topic `bar`:
+When you create an event domain, you're given a publishing endpoint similar to if you had created a topic in Event Grid. To publish events to any topic in an event domain, push the events to the domain's endpoint the [same way you would for a custom topic](./post-to-custom-topic.md). The only difference is that you must specify the topic you'd like the event to be delivered to. For example, publishing the following array of events would send event with `"id": "1111"` to topic `foo` while the event with `"id": "2222"` would be sent to topic `bar`. 
+
+
+# [Event Grid event schema](#tab/event-grid-event-schema)
+When using the **Event Grid event schema**, specify the name of the Event Grid topic in the domain as a value for the `topic` property. In the following example, `topic` property is set to `foo` for the first event and to `bar` for the second event. 
 
 ```json
 [{
@@ -65,6 +74,40 @@ When you create an event domain, you're given a publishing endpoint similar to i
   "dataVersion": "1.0"
 }]
 ```
+# [Cloud event schema](#tab/cloud-event-schema)
+
+When using the **cloud event schema**, specify the name of the Event Grid topic in the domain as a value for the `source` property. In the following example, `source` property is set to `foo` for the first event and to `bar` for the second event. 
+
+If you want to use a different field to specify the intended topic in the domain, specify input schema mapping when creating the domain. For example, if you're using the REST API, use the [properties.inputSchemaMapping](/rest/api/eventgrid/controlplane-preview/domains/create-or-update#jsoninputschemamapping) property when to map that field to `properties.topic`. If you're using the .NET SDK, use  [`EventGridJsonInputSchemaMapping `](/dotnet/api/azure.resourcemanager.eventgrid.models.eventgridjsoninputschemamapping). Other SDKs also support the schema mapping. 
+
+```json
+[{
+  "source": "foo",
+  "id": "1111",
+  "type": "maintenanceRequested",
+  "subject": "myapp/vehicles/diggers",
+  "time": "2018-10-30T21:03:07+00:00",
+  "data": {
+    "make": "Contoso",
+    "model": "Small Digger"
+  },
+	"specversion": "1.0"
+},
+{
+  "source": "bar",
+  "id": "2222",
+  "type": "maintenanceCompleted",
+  "subject": "myapp/vehicles/tractors",
+  "time": "2018-10-30T21:04:12+00:00",
+  "data": {
+    "make": "Contoso",
+    "model": "Big Tractor"
+  },
+	"specversion": "1.0"
+}]
+```
+
+---
 
 Event domains handle publishing to topics for you. Instead of publishing events to each topic you manage individually, you can publish all of your events to the domain's endpoint. Event Grid makes sure each event is sent to the correct topic.