Merge pull request #240047 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to main

Author: huypub

articles/active-directory/devices/troubleshoot-device-dsregcmd.md

@@ -203,6 +203,13 @@ Active Directory Federation Services (AD FS). For hybrid Azure AD-joined devices
 This field is skipped if no diagnostics information is available.
 The diagnostics information fields are same as **AcquirePrtDiagnostics**
 
+>[!NOTE]
+> The following Cloud Kerberos diagnostics fields were added in the original release of Windows 11 (version 21H2).
+
+- **OnPremTgt**: Set the state to *YES* if a Cloud Kerberos ticket to access on-premises resources is present on the device for the logged-in user.
+- **CloudTgt**: Set the state to *YES* if a Cloud Kerberos ticket to access cloud resources is present on the device for the logged-in user.
+- **KerbTopLevelNames**: List of top level Kerberos realm names for Cloud Kerberos.
+
 ### Sample SSO state output
 
 ```
@@ -228,6 +235,9 @@ The diagnostics information fields are same as **AcquirePrtDiagnostics**
    EnterprisePrtUpdateTime : 2019-01-24 19:15:33.000 UTC
    EnterprisePrtExpiryTime : 2019-02-07 19:15:33.000 UTC
     EnterprisePrtAuthority : https://fs.hybridadfs.nttest.microsoft.com:443/adfs
+                 OnPremTgt : YES
+                  CloudTgt : YES
+         KerbTopLevelNames : .windows.net,.windows.net:1433,.windows.net:3342,.azure.net,.azure.net:1433,.azure.net:3342
 
 +----------------------------------------------------------------------+
 ```
@@ -365,6 +375,14 @@ This diagnostics section performs the prerequisites check for setting up Windows
 - **LogonCertTemplateReady**: This setting is specific to WHFB Certificate Trust deployment and present only if the CertEnrollment state is *enrollment authority*. Set the state to *YES* if the state of the login certificate template is valid and helps troubleshoot the AD FS Registration Authority (RA).
 - **PreReqResult**: Provides the result of all WHFB prerequisites evaluation. Set the state to *Will Provision* if WHFB enrollment would be launched as a post-login task when the user signs in next time.
 
+>[!NOTE]
+> The following Cloud Kerberos diagnostics fields were added in the Windows 10 May 2021 update (version 21H1).
+
+>[!NOTE]
+> Prior to Windows 11 version 23H2, the setting **OnPremTGT** was named **CloudTGT**.
+
+- **OnPremTGT**: This setting is specific to Cloud Kerberos trust deployment and present only if the CertEnrollment state is *none*. Set the state to *YES* if the device has a Cloud Kerberos ticket to access on-premises resources. Prior to Windows 11 version 23H2, this setting was named **CloudTGT**.
+
 ### Sample NGC prerequisites check output
 
 ```

articles/azure-monitor/essentials/prometheus-metrics-troubleshoot.md

@@ -15,7 +15,7 @@ Replica pod scrapes metrics from `kube-state-metrics` and custom scrape targets
 
 ## Metrics Throttling
 
-In the Azure portal, navigate to your Azure Monitor Workspace. Go to `Metrics` and verify that the metrics `Active Time Series % Utilization` and `Events Per Minuted Ingested % Utilization` are below 100%.
+In the Azure portal, navigate to your Azure Monitor Workspace. Go to `Metrics` and verify that the metrics `Active Time Series % Utilization` and `Events Per Minute Ingested % Utilization` are below 100%.
 
 :::image type="content" source="media/prometheus-metrics-troubleshoot/throttling.png" alt-text="Screenshot showing how to navigate to the throttling metrics." lightbox="media/prometheus-metrics-troubleshoot/throttling.png":::
 

articles/cognitive-services/openai/concepts/models.md

@@ -140,10 +140,13 @@ Currently, we offer three families of Embeddings models for different functional
 
 Each family includes models across a range of capability. The following list indicates the length of the numerical vector returned by the service, based on model capability:
 
-- Ada: 1024 dimensions
-- Babbage: 2048 dimensions
-- Curie: 4096 dimensions
-- Davinci: 12288 dimensions
+|  Base Model  |  Model(s)  |  Dimensions  |
+|---|---|---|
+| Ada | models ending in -001 (Version 1) | 1024 |
+| Ada | text-embedding-ada-002 (Version 2) | 1536 |
+| Babbage |  | 2048 |
+| Curie |  | 4096 |
+| Davinci |  | 12288 |
 
 Davinci is the most capable, but is slower and more expensive than the other models. Ada is the least capable, but is both faster and cheaper.
 

articles/container-apps/azure-resource-manager-api-spec.md

@@ -184,7 +184,7 @@ Changes made to the `template` section are [revision-scope changes](revisions.md
 
 ### <a name="container-app-examples"></a>Examples
 
-For details on health probes, refer to [Heath probes in Azure Container Apps](./health-probes.md).
+For details on health probes, refer to [Health probes in Azure Container Apps](./health-probes.md).
 
 # [ARM template](#tab/arm-template)
 

articles/logic-apps/azure-arc-enabled-logic-apps-create-deploy-workflows.md

@@ -633,8 +633,8 @@ The following example describes a sample App Service plan resource definition th
       "type": "CustomLocation"
    },
    "sku": {
-      "tier": "K1",
-      "name": "Kubernetes", 
+      "tier": "Kubernetes",
+      "name": "K1", 
       "capacity": 1
    },
    "properties": {

articles/virtual-machines/vm-generalized-image-version.md

@@ -501,7 +501,7 @@ location="<location where the image is replicated>"
 user='<username for the VM>'
 name='<name for the VM>'
 
-az group create --location --resource-group $resourcegroup
+az group create --location $location --resource-group $resourcegroup
 az vm create \
   --resource-group $resourcegroup \
   --name $name \

articles/web-application-firewall/afds/waf-faq.yml

@@ -78,7 +78,7 @@ sections:
       - question: |
           Do you support same WAF features in all integrated platforms?
         answer: |
-          Currently, ModSec CRS 2.2.9, CRS 3.0, and CRS 3.1 rules are only supported with WAF on Application Gateway. Rate limiting, geo-filtering, and Azure managed Default Rule Set rules are supported only with WAF on Azure Front Door.
+          Currently, ModSec CRS 3.0, CRS 3.1 and CRS 3.2 rules are only supported with WAF on Application Gateway. Rate limiting and Azure managed Default Rule Set rules are supported only with WAF on Azure Front Door.
 
       - question: |
           Is DDoS protection integrated with Front Door?