Merge pull request #288748 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Daidihuang

articles/azure-functions/durable/durable-functions-external-events.md

@@ -63,7 +63,7 @@ import azure.functions as func
 import azure.durable_functions as df
 
 def orchestrator_function(context: df.DurableOrchestrationContext):
-    approved = context.wait_for_external_event('Approval')
+    approved = yield context.wait_for_external_event('Approval')
     if approved:
         # approval granted - do the approved action
     else:
@@ -169,7 +169,7 @@ def orchestrator_function(context: df.DurableOrchestrationContext):
     event2 = context.wait_for_external_event('Event2')
     event3 = context.wait_for_external_event('Event3')
 
-    winner = context.task_any([event1, event2, event3])
+    winner = yield context.task_any([event1, event2, event3])
     if winner == event1:
         # ...
     elif winner == event2:
@@ -426,4 +426,4 @@ In this case, the instance ID is hardcoded as *MyInstanceId*.
 > [Learn how to implement error handling](durable-functions-error-handling.md)
 
 > [!div class="nextstepaction"]
-> [Run a sample that waits for human interaction](durable-functions-phone-verification.md)
+> [Run a sample that waits for human interaction](durable-functions-phone-verification.md)

articles/cdn/cdn-map-content-to-custom-domain.md

@@ -21,7 +21,7 @@ This tutorial shows how to add a custom domain to an Azure Content Delivery Netw
 
 The endpoint name in your content delivery network profile is a subdomain of azureedge.net. By default when delivering content, the content delivery network profile domain gets included in the URL.
 
-For example, `https://contoso.azureedge.net/photo.png`.
+For example, `https://*.azureedge.net/photo.png`.
 
 Azure Content Delivery Network provides the option of associating a custom domain with a content delivery network endpoint. This option delivers content with a custom domain in your URL instead of the default domain.
 

articles/expressroute/expressroute-connectivity-models.md

@@ -22,7 +22,7 @@ If you're colocated in a facility with a cloud exchange, you can request for vir
 
 ## <a name="Ethernet"></a>Point-to-point Ethernet connections
 
-You can connect your on-premises datacenters or offices to the Microsoft cloud through point-to-point Ethernet links. Point-to-point Ethernet providers can offer Layer 2 connections, or managed Layer 3 connections between your site and the Microsoft cloud.
+You can connect your on-premises datacenters or offices to the Microsoft cloud through point-to-point Ethernet links. Point-to-point Ethernet providers can offer Layer 2 connections.
 
 ## <a name="IPVPN"></a>Any-to-any (IPVPN) networks
 
@@ -41,4 +41,4 @@ You can connect directly into the Microsoft global network at a peering location
 * Configure your ExpressRoute connection.
   * [Create an ExpressRoute circuit](expressroute-howto-circuit-portal-resource-manager.md)
   * [Configure routing](expressroute-howto-routing-portal-resource-manager.md)
-  * [Link a virtual network to an ExpressRoute circuit](expressroute-howto-linkvnet-portal-resource-manager.md)
+  * [Link a virtual network to an ExpressRoute circuit](expressroute-howto-linkvnet-portal-resource-manager.md)

articles/frontdoor/front-door-diagnostics.md

@@ -128,7 +128,7 @@ The following example JSON snippet shows a health probe log entry for a failed h
   "records": [
     {
       "time": "2021-02-02T07:15:37.3640748Z",
-      "resourceId": "/SUBSCRIPTIONS/27CAFCA8-B9A4-4264-B399-45D0C9CCA1AB/RESOURCEGROUPS/AFDXPRIVATEPREVIEW/PROVIDERS/MICROSOFT.CDN/PROFILES/AFDXPRIVATEPREVIEW-JESSIE",
+      "resourceId": "/SUBSCRIPTIONS/mySubscriptionID/RESOURCEGROUPS/myResourceGroup/PROVIDERS/MICROSOFT.CDN/PROFILES/MyProfile",
       "category": "FrontDoorHealthProbeLog",
       "operationName": "Microsoft.Cdn/Profiles/FrontDoorHealthProbeLog/Write",
       "properties": {
@@ -137,9 +137,9 @@ The following example JSON snippet shows a health probe log entry for a failed h
         "httpVerb": "HEAD",
         "result": "OriginError",
         "httpStatusCode": "400",
-        "probeURL": "http://afdxprivatepreview.blob.core.windows.net:80/",
-        "originName": "afdxprivatepreview.blob.core.windows.net",
-        "originIP": "52.239.224.228:80",
+        "probeURL": "http://www.example.com:80/",
+        "originName": "www.example.com",
+        "originIP": "PublicI:Port",
         "totalLatencyMilliseconds": "141",
         "connectionLatencyMilliseconds": "68",
         "DNSLatencyMicroseconds": "1814"