Merge pull request #274852 from MicrosoftDocs/repo_sync_working_branch

Saisang · web-flow · commit 543355b69462 · 2024-05-10T13:21:12.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/custom-policies-series-sign-up-or-sign-in-federation.md b/articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in-federation.md
@@ -225,7 +225,7 @@ Notice the claims transformations we defined in [step 3.2](#step-32---define-cla
 
 Just like in sign-in with a local account, you need to configure the [Microsoft Entra Technical Profiles](active-directory-technical-profile.md), which you use to connect to Microsoft Entra ID storage, to store or read a user social account. 
 
-1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile by using the following code: 
+1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile below it by using the following code: 
 
     ```xml
         <TechnicalProfile Id="AAD-UserWriteUsingAlternativeSecurityId">
@@ -517,6 +517,7 @@ Use the following steps to add a combined local and social account:
     ```xml
         <OutputClaim ClaimTypeReferenceId="authenticationSource" DefaultValue="localIdpAuthentication" AlwaysUseDefaultValue="true" />
     ```
+   Make sure you also add the `authenticationSource` claim in the output claims collection of the `UserSignInCollector` self-asserted technical profile.
 
 1. In the `UserJourneys` section, add a new user journey, `LocalAndSocialSignInAndSignUp` by using the following code: 
 
diff --git a/articles/ai-services/use-key-vault.md b/articles/ai-services/use-key-vault.md
@@ -206,7 +206,7 @@ namespace key_vault_console_app
 
 ## Run the application
 
-Run the application by selecting the **Debug** button at the top of Visual studio. Your key and endpoint secrets will be retrieved from your key vault. 
+Run the application by selecting the **Debug** button at the top of Visual Studio. Your key and endpoint secrets will be retrieved from your key vault. 
 
 ## Send a test Language service call (optional)
 
@@ -376,18 +376,17 @@ In your project, add the following dependencies to your `pom.xml` file.
 
 ```xml
 <dependencies>
-        
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-security-keyvault-secrets</artifactId>
-            <version>4.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-identity</artifactId>
-            <version>1.2.0</version>
-        </dependency>
-    </dependencies>
+    <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-security-keyvault-secrets</artifactId>
+        <version>4.2.3</version>
+    </dependency>
+    <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-identity</artifactId>
+        <version>1.2.0</version>
+    </dependency>
+</dependencies>
 ```
 
 ## Import the example code
diff --git a/articles/azure-cache-for-redis/cache-managed-identity.md b/articles/azure-cache-for-redis/cache-managed-identity.md
@@ -191,4 +191,4 @@ If you're not using managed identity and instead authorizing a storage account w
 ## Related content
 
 - [Learn more](cache-overview.md#service-tiers) about Azure Cache for Redis features
-- [What are managed identifies](../active-directory/managed-identities-azure-resources/overview.md)
+- [What are managed identities](../active-directory/managed-identities-azure-resources/overview.md)
diff --git a/articles/azure-vmware/configure-azure-elastic-san.md b/articles/azure-vmware/configure-azure-elastic-san.md
@@ -94,6 +94,11 @@ Once your SDDC express route is connected with the private endpoint for your Ela
 
 To delete the Elastic SAN-based datastore, use the following steps from the Azure portal.
 
-1. From the left navigation in your Azure VMware Solution private cloud, select **Storage**, then **Storage list**.
-1. Under **Virtual network**, select **Disconnect** to disconnect the datastore from the Cluster(s).
+1. From the left navigation in your Azure VMware Solution private cloud, select **Storage**, then **Datastore list**.
+1. On the far right is an **ellipsis**. Select **Delete** to disconnect the datastore from the Cluster(s).
+   
+   :::image type="content" source="media/configure-azure-elastic-san/elastic-san-datastore-list-ellipsis-removal.png" alt-text="Screenshot showing Elastic SAN volume removal." border="false"lightbox="media/configure-azure-elastic-san/elastic-san-datastore-list-ellipsis-removal.png":::
+   
 1. Optionally you can delete the volume you previously created in your Elastic SAN.
+	> [!NOTE]
+	> This operation can't be completed if virtual machines or virtual disks reside on an Elastic SAN VMFS Datastore.
diff --git a/articles/azure-vmware/media/configure-azure-elastic-san/elastic-san-datastore-list-ellipsis-removal.png b/articles/azure-vmware/media/configure-azure-elastic-san/elastic-san-datastore-list-ellipsis-removal.png
diff --git a/articles/certification/overview.md b/articles/certification/overview.md
@@ -1,7 +1,7 @@
 ---
 title: Overview of the Edge Secured-core program
 description: An overview of the Edge Secured-core program for our partners and customers. Use these resources to start the certification process. Find out how to certify your device, from IoT device requirements to the device being published.
-author: sufon
+author: sufenfong
 ms.author: sufon
 ms.topic: overview 
 ms.date: 02/07/2024
@@ -16,7 +16,7 @@ ms.service: certification
 Edge Secured-Core is Microsoft's recommended standard for highly secured embedded devices. Such devices must include hardware security features, must be shipped in a secured state, and must be able to connect to services that enable that security monitoring and maintenance for the lifetime of the device. 
 
 ## Program purpose ##
-Edge Secured-core is a security certification for devices running a full operating system. Edge Secured-core currently supports Windows IoT and Azure Sphere OS. Linux support is coming in the future. Devices meeting this criteria enable these promises:
+Edge Secured-core is a security certification for devices running a full operating system. Edge Secured-core currently supports [Windows IoT Enterprise](/windows/iot/iot-enterprise/whats-new/release-history) and Azure Sphere OS. Linux support is coming in the future. Devices meeting this criteria enable these promises:
 
 1. Hardware-based device identity 
 2. Capable of enforcing system integrity 
diff --git a/articles/migrate/how-to-create-azure-vmware-solution-assessment.md b/articles/migrate/how-to-create-azure-vmware-solution-assessment.md
@@ -22,7 +22,7 @@ This article describes how to create an Azure VMware Solution assessment for on-
 - Make sure you've [created](./create-manage-projects.md) an Azure Migrate project.
 - If you've already created a project, make sure you've [added](how-to-assess.md) the Azure Migrate: Discovery and assessment tool.
 - To create an assessment, you need to set up an Azure Migrate appliance for [VMware vSphere](how-to-set-up-appliance-vmware.md), which discovers the on-premises servers, and sends metadata and performance data to Azure Migrate: Discovery and assessment. [Learn more](migrate-appliance.md).
-- You could also [import the server metadata](./tutorial-discover-import.md) in comma-separated values (CSV) format.
+- You could also [import the server metadata](./tutorial-discover-import.md) in comma-separated values (CSV) format or [import your RVTools XLSX file](./tutorial-import-vmware-using-rvtools-xlsx.md).
 
 
 ## Azure VMware Solution (AVS) Assessment overview
@@ -59,7 +59,7 @@ There are two types of sizing criteria that you can use to create Azure VMware S
 1. In **Discovery source**:
 
     - If you discovered servers using the appliance, select **Servers discovered from Azure Migrate appliance**.
-    - If you discovered servers using an imported CSV file, select **Imported servers**. 
+    - If you discovered servers using an imported CSV or RVTools file, select **Imported servers**. 
     
 1. Click **Edit** to review the assessment properties.
 
@@ -153,7 +153,7 @@ You can click on  **Sizing assumptions** to understand the assumptions that went
 
 3. Review the Suggested tool:
     - **VMware HCX Advanced or Enterprise**: For VMware vSphere VMs, VMware Hybrid Cloud Extension (HCX) solution is the suggested migration tool to migrate your on-premises workload to your Azure VMware Solution (AVS) private cloud. [Learn More](../azure-vmware/configure-vmware-hcx.md).
-    - **Unknown**: For servers imported via a CSV file, the default migration tool is unknown. Though for VMware vSphere VMs, it is suggested to use the VMware Hybrid Cloud Extension (HCX) solution. 
+    - **Unknown**: For servers imported via a CSV or RVTools file, the default migration tool is unknown. Though for VMware vSphere VMs, it is suggested to use the VMware Hybrid Cloud Extension (HCX) solution. 
 
 4. Click on an **AVS readiness** status. You can view VM readiness details, and drill down to see VM details, including compute, storage, and network settings.
 
