Merge pull request #297985 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit cdeac702ccd6 · 2025-04-10T05:36:23.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory-b2c/api-connectors-overview.md b/articles/active-directory-b2c/api-connectors-overview.md
@@ -85,7 +85,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
 ![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
 
 > [!NOTE]
-> If there is slow or no response from the RESTful service to Azure AD B2C, the timeout is 30 seconds and the retry count is two times (meaning there are 3 tries in total). Currently, you can't configure the timeout and retry count settings.
+> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
 
 ## Calling a RESTful service
 
diff --git a/articles/azure-maps/creator-facility-ontology.md b/articles/azure-maps/creator-facility-ontology.md
@@ -81,7 +81,7 @@ When importing a GeoJSON package, the `ID` and `Geometry` fields must be supplie
 
 :::image type="content" source="./media/creator-indoor-maps/geojson.png" alt-text="A screenshot showing the geometry and ID fields in a GeoJSON file.":::
 
-For more information, see [Create a dataset using a GeoJson package].
+For more information, see [Create a dataset using a GeoJSON package].
 
 ---
 
@@ -585,7 +585,7 @@ Learn more about Creator for indoor maps by reading:
 [Polygon]: /rest/api/maps-creator/wfs/get-features?tabs=HTTP#geojsonpolygon
 
 <!---------   learn.microsoft.com links     --------------->
-[Create a dataset using a GeoJson package]: how-to-dataset-geojson.md
+[Create a dataset using a GeoJSON package]: how-to-dataset-geojson.md
 [Creator for indoor maps]: creator-indoor-maps.md
 
 <!---------   External Links     --------------->
diff --git a/articles/azure-maps/how-to-dataset-geojson.md b/articles/azure-maps/how-to-dataset-geojson.md
@@ -1,6 +1,6 @@
 ---
-title: How to create a dataset using a GeoJson package
-description: Learn how to create a dataset using a GeoJson package.
+title: How to create a dataset using a GeoJSON package
+description: Learn how to create a dataset using a GeoJSON package.
 author: faterceros
 ms.author: aterceros
 ms.date: 11/01/2021
@@ -9,7 +9,7 @@ ms.service: azure-maps
 ms.subservice: creator
 ---
 
-# Create a dataset using a GeoJson package (Preview)
+# Create a dataset using a GeoJSON package (Preview)
 
 > [!NOTE]
 >
@@ -36,7 +36,7 @@ Azure Maps Creator enables users to import their indoor map data in GeoJSON form
 
 ## Create dataset using the GeoJSON package
 
-For more information on the GeoJSON package, see the [Geojson zip package requirements] section.
+For more information on the GeoJSON package, see the [GeoJSON zip package requirements] section.
 
 ### Upload the GeoJSON package
 
@@ -95,7 +95,7 @@ https://us.atlas.microsoft.com/datasets?api-version=2023-03-01-preview&conversio
 | conversionId | The ID returned when converting your drawing package.                              |
 | datasetId    | The dataset ID returned when creating the original dataset from a GeoJSON package. |
 
-## Geojson zip package requirements
+## GeoJSON zip package requirements
 
 The GeoJSON zip package consists of one or more [RFC 7946] compliant GeoJSON files, one for each feature class, all in the root directory (subdirectories aren't supported), compressed with standard Zip compression and named using the `.ZIP` extension.
 
@@ -137,7 +137,7 @@ Feature IDs can only contain alpha-numeric (a-z, A-Z, 0-9), hyphen (-), dot (.)
 [dataset]: creator-indoor-maps.md#datasets
 [Facility Ontology 2.0]: creator-facility-ontology.md?pivots=facility-ontology-v2
 [facility]: creator-facility-ontology.md?pivots=facility-ontology-v2#facility
-[Geojson zip package requirements]: #geojson-zip-package-requirements
+[GeoJSON zip package requirements]: #geojson-zip-package-requirements
 [How to create data registry]: how-to-create-data-registries.md
 [level]: creator-facility-ontology.md?pivots=facility-ontology-v2#level
 [line]: creator-facility-ontology.md?pivots=facility-ontology-v2#lineelement
diff --git a/articles/azure-vmware/native-network-connectivity.md b/articles/azure-vmware/native-network-connectivity.md
@@ -25,6 +25,8 @@ This Azure VMware Solution private cloud deployment is hosted in an Azure Virtua
 
 Azure VMware Solution creates the following read-only management subnets within the hosted Virtual Network to host required private cloud components. These Management Subnets are allocated from the management address block specified for private cloud creation. The following  are sample subnets derived from an SDDC with a 10.74.64.0/22 address block.
 
+:::image type="content" source="./media/native-connectivity/native-connectivity-private-vnet-peering.png" alt-text="Diagram showing an Azure VMware Solution connection to other Virtual Networks." lightbox="media/native-connectivity/native-virtual-network-management-subnets.png":::
+
 ## Other Virtual Networks
 
 Azure VMware Solution's connectivity to nonlocal Virtual Networks follows the same procedure as Azure Virtual Network users use to connect their workloads between Virtual Networks. The Virtual Network can be connected to other nonlocal Virtual Networks using Azure Virtual Network peering as described in the following [Azure documentation](/azure/virtual-network/virtual-network-peering-overview).
@@ -41,4 +43,4 @@ Both regional Virtual Network peering and global Virtual Network peering is supp
 - [Internet connectivity options](native-internet-connectivity-design-considerations.md)
 - [Connect multiple Azure VMware Solution in an Azure Virtual Network private clouds](native-connect-multiple-private-clouds.md)
 - [Connect Azure VMware Solution private cloud in a Virtual Network to the previous edition of Azure VMware Solution private cloud](native-connect-private-cloud-previous-edition.md)
-- [Public and Private DNS forward lookup zone configuration](native-dns-forward-lookup-zone.md)
+- [Public and Private DNS forward lookup zone configuration](native-dns-forward-lookup-zone.md)
diff --git a/articles/communication-services/samples/chat-hero-sample.md b/articles/communication-services/samples/chat-hero-sample.md
@@ -6,7 +6,7 @@ author: kperla97
 manager: chpalm
 services: azure-communication-services
 
-ms.author: kaperla
+ms.author: anniewang
 ms.date: 6/30/2021
 ms.topic: overview
 ms.service: azure-communication-services
@@ -43,8 +43,7 @@ Once you configure your display name and emoji, you can join the chat session. N
 Components of the main chat screen:
 
 - **Main Chat Area**: The core chat experience where users can send and receive messages. To send messages, you can use the input area and press enter (or use the send button). The chat screen organizes received chat messages by sender with the correct name and emoji. You see two types of notifications in the chat area: 1) typing notifications when a user is typing and 2) sent and read notifications for messages.
-- **Header**: Where the user sees the title of the chat thread and the controls for toggling participant and settings side bars, and a leave button to exit the chat session.
-- **Side Bar**: Where participants and setting information display when toggled using the controls in the header. The participants side bar contains a list of participants in the chat and a link to invite participants to the chat session. The settings side bar enables you to configure the chat thread title.
+- **Header**: Where the user sees the title of the chat thread and the leave button to exit the chat session.
 
 Complete the following prerequisites and steps to set up the sample.
 
diff --git a/articles/communication-services/samples/media/chat/main-app.png b/articles/communication-services/samples/media/chat/main-app.png
diff --git a/articles/container-apps/health-probes.md b/articles/container-apps/health-probes.md
@@ -82,7 +82,7 @@ The `...` placeholders denote omitted code. Refer to [Container Apps ARM templat
       "name":"web",
       "probes": [
         {
-          "type": "liveness",
+          "type": "Liveness",
           "httpGet": {
             "path": "/health",
             "port": 8080,
@@ -96,15 +96,15 @@ The `...` placeholders denote omitted code. Refer to [Container Apps ARM templat
           "periodSeconds": 3
         },
         {
-          "type": "readiness",
+          "type": "Readiness",
           "tcpSocket": {
             "port": 8081
           },
           "initialDelaySeconds": 10,
           "periodSeconds": 3
         },
         {
-          "type": "startup",
+          "type": "Startup",
           "httpGet": {
             "path": "/startup",
             "port": 8080,
@@ -130,7 +130,7 @@ containers:
   - image: nginx
     name: web
     probes:
-      - type: liveness
+      - type: Liveness
         httpGet:
           path: "/health"
           port: 8080
@@ -139,12 +139,12 @@ containers:
               value: "liveness probe"
         initialDelaySeconds: 7
         periodSeconds: 3
-      - type: readiness
+      - type: Readiness
         tcpSocket:
           port: 8081
         initialDelaySeconds: 10
         periodSeconds: 3
-      - type: startup
+      - type: Startup
         httpGet:
           path: "/startup"
           port: 8080
@@ -181,7 +181,7 @@ The following example demonstrates how to configure the liveness and readiness p
 ```json
 "probes": [
        {
-        "type": "liveness",
+        "type": "Liveness",
         "failureThreshold": 3,
         "periodSeconds": 10,
         "successThreshold": 1,
@@ -191,7 +191,7 @@ The following example demonstrates how to configure the liveness and readiness p
         "timeoutSeconds": 1
        },
        {
-         "type": "readiness",
+         "type": "Readiness",
          "failureThreshold": 48,
          "initialDelaySeconds": 3,
          "periodSeconds": 5,
