Merge pull request #249907 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: Taojunshen

articles/active-directory/external-identities/customers/faq-customers.md

@@ -67,6 +67,10 @@ Opt for the next generation Microsoft Entra External ID platform if:
 - You’re starting fresh building identities into apps or you're in the early stages of product discovery.
 - The benefits of rapid innovation, new features and capabilities are a priority.
 
+### Why is Azure AD B2C not part of Entra ID/External ID?
+
+Microsoft Entra External ID and Azure AD B2C are two separate platforms powered by ESTS and IEF respectively. Entra External ID is our new converged platform which is future proof and developer friendly to meet all your identity needs – B2E, B2B and B2C. At the same time, we will still continue to support Azure AD B2C as a separate product offering with no change in SLA, and we’ll continue investments in the product to ensure security, availability, and reliability.
+
 ## Next steps
 
-[Learn more about Microsoft Entra External ID for customers](index.yml)
+[Learn more about Microsoft Entra External ID for customers](index.yml)

articles/ai-services/openai/concepts/use-your-data.md

@@ -224,7 +224,7 @@ Azure OpenAI on your data provides several search options you can use when you a
 | *semantic*          |  Semantic search  |  Additional pricing for [semantic search](/azure/search/semantic-search-overview#availability-and-pricing) usage.                  |      
 | *vector*            | Vector search       | [Additional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) on your Azure OpenAI account from calling the embedding model.                    |   
 | *vector + simple*   | A hybrid of vector search and simple search | [Additional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) on your Azure OpenAI account from calling the embedding model.            |      
-| *vector + semantic* | A hybrid of vector search and semantic search for retrieval.     | [Additional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) on your Azure OpenAI account from calling the embedding model, and additional pricing for [semantic search](/azure/search/semantic-search-overview#availability-and-pricing) usage.                    |     
+| *vector + semantic + simple * | A hybrid of vector search, simple search (keyword based) and  semantic search for retrieval     | [Additional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) on your Azure OpenAI account from calling the embedding model, and additional pricing for [semantic search](/azure/search/semantic-search-overview#availability-and-pricing) usage.                    |     
 
 The optimal search option can vary depending on your dataset and use-case. You may need to experiment with multiple options to determine which works best for your use-case.
 

articles/azure-large-instances/toc.yml

@@ -20,5 +20,5 @@
   items:
   - name: Azure Large Instances for Epic workload
     href: ./workloads/epic/index.yml
-- name: FAQ
-  href: faq.md
+  - name: FAQ
+    href: faq.md

articles/azure-vmware/enable-sql-azure-hybrid-benefit.md

@@ -1,49 +1,53 @@
 ---
-title: Enable SQL Azure hybrid benefit for Azure VMware Solution
-description: This article shows you how to apply SQL Azure hybrid benefits to your Azure VMware Solution private cloud by configuring a placement policy.
+title: Enable Azure Hybrid Benefit for SQL Server in Azure VMware Solution
+author: jjaygbay1
+ms.author: jacobjaygbay
+description: This article shows you how to apply Enable Azure Hybrid Benefit for SQL Server in Azure VMware Solution to your Azure VMware Solution private cloud by configuring a placement policy.
 ms.topic: how-to
 ms.service: azure-vmware
 ms.date: 02/14/2023
 ---
 
-# Enable SQL Azure hybrid benefit for Azure VMware Solution
+# Enable Azure Hybrid Benefit for SQL Server in Azure VMware Solution
 
-In this article, you’ll learn how to configure SQL Azure hybrid benefits to an Azure VMware Solution private cloud by configuring a placement policy. The placement policy defines the hosts that are running SQL as well as the virtual machines on that host. 
->[!IMPORTANT]
-> It is important to note that SQL benefits are applied at the host level. 
+In this article, you’ll learn how to configure Azure Hybrid Benefit for SQL Server in an Azure VMware Solution private cloud by configuring a placement policy. The placement policy defines the hosts that are running SQL Server as well as the virtual machines on that host.  
 
-For example, if each host in Azure VMware Solution has 36 cores and you signal that two hosts run SQL, then SQL Azure hybrid benefit will apply to 72 cores irrespective of the number of SQL or other virtual machines on that host.
+> [!IMPORTANT]
+> It is important to note that SQL Server benefits are applied at the host level.  
 
-You can also choose to view a video tutorial for configuring SQL Azure hybrid benefits for Azure VMware Solution [here](https://www.youtube.com/watch?v=vJIQ1K2KTa0).
+For example, if each host in Azure VMware Solution has 36 cores and you intend to have 2 hosts run SQL Server then the Azure Hybrid Benefit will apply to 72 cores, irrespective of the number of SQL Server instances or other virtual machines are on that host. 
 
-## Configure host-VM placement policy
-1.	From your Azure VMware Solution private cloud, select Azure hybrid benefit, then Create host-VM placement policy.
- :::image type="content" source="media/sql-azure-hybrid-benefit/azure-hybrid-benefit.png" alt-text="Diagram that shows how to create a host new virtual machine placement policy.":::
+You can also choose to view a video tutorial for configuring Azure Hybrid Benefit for SQL Server in Azure VMware Solution [here](https://www.youtube.com/watch?v=vJIQ1K2KTa0).
 
-1.	Fill in the required fields for creating the placement policy.
-     1.	**Name** – Select the name that identifies this policy.
+## Configure host-VM placement policy 
+
+1. From your Azure VMware Solution private cloud, select Azure hybrid benefit, then Create host-VM placement policy.
+
+    :::image type="content" source="media/sql-azure-hybrid-benefit/azure-hybrid-benefit.png" alt-text="Diagram that shows how to create a host new virtual machine placement policy.":::
+
+1. Fill in the required fields for creating the placement policy.
+     1. **Name** – Select the name that identifies this policy.
      2. **Type** – Select the type of policy. This type must be a VM-Host affinity rule only.
      3. **Azure hybrid benefit** – Select the checkbox to apply the SQL Azure hybrid benefit.
      4. **Cluster** – Select the correct cluster. The policy is scoped to host in this cluster only.
-     1. **Enabled** – Select enabled to apply the policy immediately once created.
-     
+     5. **Enabled** – Select enabled to apply the policy immediately once created.
      :::image type="content" source="media/sql-azure-hybrid-benefit/create-placement-policy.png" alt-text="Diagram that shows how to create a host virtual machine placement policy using the host VM affinity.":::
-3.	Select the hosts and VMs that will be applied to the VM-Host affinity policy.
+2. Select the hosts and VMs that will be applied to the VM-Host affinity policy.
      1.	**Add Hosts** – Select the hosts that will be running SQL. When hosts are replaced, policies are re-created on the new hosts automatically.
      2.	**Add VMs** – Select the VMs that should run on the selected hosts.
      3. **Review and Create** the policy.
      :::image type="content" source="media/sql-azure-hybrid-benefit/select-policy-host.png" alt-text="Diagram that shows how to create a host virtual machine affinity.":::
 
-## Manage placement policies
+## Manage placement policies 
 
-After creating the placement policy, you can review, manage, or edit the policy by way of the Placement policies menu in the Azure VMware Solution private cloud. 
+After creating the placement policy, you can review, manage, or edit the policy by way of the Placement policies menu in the Azure VMware Solution private cloud.  
 
-By checking the Azure hybrid benefit checkbox in the configuration setting, you can enable existing host-VM affinity policies with the SQL Azure hybrid benefit.
+By checking the Azure Hybrid Benefit checkbox in the configuration setting, you can enable existing host-VM affinity policies with the Azure Hybrid Benefit for SQL Server. 
 
-:::image type="content" source="media/sql-azure-hybrid-benefit/placement-policies.png" alt-text="Diagram that shows how to configure virtual machine placement policies.":::
+:::image type="content" source="media/sql-azure-hybrid-benefit/placement-policies.png" alt-text="Diagram that shows how to configure virtual machine placement policies."::: 
 
 ## Next steps
-[Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/)
 
-[Attach Azure NetApp Files datastores to Azure VMware Solution hosts](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md)
+[Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/)
 
+[Attach Azure NetApp Files datastores to Azure VMware Solution hosts](attach-azure-netapp-files-to-azure-vmware-solution-hosts.md)