Merge pull request #294913 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 52f4a9667119 · 2025-02-20T01:31:27.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/automation/extension-based-hybrid-runbook-worker-install.md b/articles/automation/extension-based-hybrid-runbook-worker-install.md
@@ -77,7 +77,8 @@ If extension-based Hybrid Worker is using custom Hybrid Worker credentials, then
 | Arc-enabled Server | C:\ProgramData\AzureConnectedMachineAgent\Tokens (read) </br> C:\Packages\Plugins\Microsoft.Azure.Automation.HybridWorker.HybridWorkerForWindows (read and execute).
 
 > [!NOTE]
-> When a system has UAC/LUA in place, permissions must be granted directly and not through any group membership. [Learn more](troubleshoot/extension-based-hybrid-runbook-worker.md#scenario-runbooks-go-into-a-suspended-state-on-a-hybrid-runbook-worker-when-using-a-custom-account-on-a-server-with-user-account-control-uac-enabled).
+> - When a system has UAC/LUA in place, permissions must be granted directly and not through any group membership. [Learn more](troubleshoot/extension-based-hybrid-runbook-worker.md#scenario-runbooks-go-into-a-suspended-state-on-a-hybrid-runbook-worker-when-using-a-custom-account-on-a-server-with-user-account-control-uac-enabled).
+> - Due to a current limitation, these folder permissions are removed from the C:\ProgramData\AzureConnectedMachineAgent\Tokens folder on Azure Arc-enabled machines when the Azure Connected Machine agent is updated. The current resolution is to reapply these permissions to the folder. [Learn more](troubleshoot/extension-based-hybrid-runbook-worker.md#scenario-hybrid-runbook-worker-job-execution-on-azure-arc-enabled-windows-server-that-uses-a-custom-credential-is-unexpectedly-suspended).
 
 
 
diff --git a/articles/azure-app-configuration/concept-config-file.md b/articles/azure-app-configuration/concept-config-file.md
@@ -19,7 +19,7 @@ The rest of this document discusses both file content profiles in detail and use
 
 ## File content profile: default
 
-The default file content profile in App Configuration tools refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems. App Configuration supports JSON, Yaml, or Properties file formats.
+The default file content profile in App Configuration tools refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems. App Configuration supports JSON, YAML, or Properties file formats.
 
 The following example is a configuration file named `appsettings.json` containing one configuration setting and one feature flag.
 
diff --git a/articles/azure-app-configuration/howto-import-export-data.md b/articles/azure-app-configuration/howto-import-export-data.md
@@ -22,7 +22,7 @@ Import brings configuration data into an App Configuration store from an existin
 
 This guide shows how to import App Configuration data:
 
-- [from a configuration file in Json, Yaml or Properties](#import-data-from-a-configuration-file)
+- [from a configuration file in JSON, YAML or Properties](#import-data-from-a-configuration-file)
 - [from an App Configuration store](#import-data-from-an-app-configuration-store)
 - [from Azure App Service](#import-data-from-azure-app-service)
 
@@ -44,7 +44,7 @@ From the Azure portal, follow these steps:
 
     | Parameter    | Description                                                                             | Example |
     |--------------|-----------------------------------------------------------------------------------------|----------|
-    | File type    | Select the file type for import: YAML, Properties, or JSON. | *Json*   |
+    | File type    | Select the file type for import: YAML, Properties, or JSON. | *JSON*   |
 
 1. Click the **Browse** button, and select the file to import.
 
@@ -53,7 +53,7 @@ From the Azure portal, follow these steps:
 
     | Parameter    | Description                                                                                                                                                                                                                             | Example                   |
     |--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------|
-    | File content profile    | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, Yaml, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default*                       |
+    | File content profile    | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, YAML, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default*                       |
     | Import mode    | The import mode is used to determine whether to ignore identical key-values. With the *Ignore match* option, any key-values in the store that are the same as those in the configuration file are ignored. With the *All* option, all key-values in the configuration file are updated.   | *Ignore match*                       |
     | Exclude feature flag    | If checked, feature flags will not be imported. | *Unchecked*                       |
     | Strict    | If the box is checked, any key-values in the store with the specified prefix and label that are not included in the configuration file are deleted when the File content profile is set to Default. When the File content profile is set to KVSet, any key-values in the store that are not included in the configuration file are deleted. If the box is unchecked, no key-values in the store will be deleted.  | *Unchecked*                       |
@@ -85,7 +85,7 @@ From the Azure CLI, follow the steps below. If you don't have the Azure CLI inst
 
     | Parameter        | Description                                                                                                                                                                                                                                              | Example            |
     |------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------|
-    | `--separator`    | Optional. The separator is the delimiter for flattening the key-values to Json/Yaml. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, `—`. | `;`              |
+    | `--separator`    | Optional. The separator is the delimiter for flattening the key-values to JSON/YAML. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, `—`. | `;`              |
     | `--prefix`       | Optional. A key prefix is the beginning part of a key. Prefixes can be used to manage groups of key-values in a configuration store. This prefix will be appended to the front of the "key" property of each imported key-value.                                                               | `TestApp:`         |
     | `--label`        | Optional. Enter a label that will be assigned to your imported key-values.                                                                                                                                                                               | `prod`             |
     | `--content-type` | Optional. Enter `appconfig/kvset` or `application/json` to state that the imported content consists of a Key Vault reference or a JSON file.                                                                                                      | `application/json` |
@@ -265,7 +265,7 @@ Export writes configuration data stored in App Configuration to another destinat
 
 This guide shows how to export App Configuration data:
 
-- [to a configuration file in Json, Yaml or Properties](#export-data-to-a-configuration-file)
+- [to a configuration file in JSON, YAML or Properties](#export-data-to-a-configuration-file)
 - [to an App Configuration store](#export-data-to-an-app-configuration-store)
 - [to an Azure App Service resource](#export-data-to-azure-app-service)
 
@@ -289,7 +289,7 @@ From the [Azure portal](https://portal.azure.com), follow these steps:
     | Parameter          | Description  | Example                  |
     |--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------|
     | File type          | Select the file type for export: YAML, Properties, or JSON. | *JSON*                   | 
-    | File content profile   | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, Yaml, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default*                   |
+    | File content profile   | Select a content profile: Default or KVSet. The *Default* file content profile refers to the conventional configuration file schema widely adopted by existing programming frameworks or systems, supports JSON, YAML, or Properties file formats. The *KVSet* file content profile refers to a file schema that contains all properties of an App Configuration key-value, including key, value, label, content type, and tags. | *Default*                   |
     | Selection mode          | Select whether to export from regular key-values, which is the default option, or from a snapshot.   | *Default*                   | 
     | Key filter | Used to filter key-values based on the key name for export. If no keys are specified, all keys are eligible.    |      Starts with *TestApp:*              |
     | At a specific time | Optional. Fill out this field to export key-values from a specific point in time in the selected configuration store. If left empty, it defaults to the current point in time of the key-values. | *07/28/2022 12:00:00 AM* |
@@ -323,7 +323,7 @@ From the Azure CLI, follow the steps below. If you don't have the Azure CLI inst
 
     | Parameter        | Description                                                                                                                                                                                                                                             | Example                   |
     |------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------|
-    | `--separator`    | Optional. The separator is the delimiter for flattening the key-values to Json/Yaml. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, `—`. | `;`                     |
+    | `--separator`    | Optional. The separator is the delimiter for flattening the key-values to JSON/YAML. It's required for exporting hierarchical structure and will be ignored for property files and feature flags. Select one of the following options: `.`, `,`, `:`, `;`, `/`, `-`, `_`, `—`. | `;`                     |
     | `--prefix`       | Optional. Prefix to be trimmed from each key-value's "key" property. A key prefix is the beginning part of a key. Prefixes can be used to manage groups of key-values in a configuration store. Prefix will be ignored for feature flags.                                                | `TestApp:`                |
 
     Example: export all key-values and feature flags with label "prod" to a JSON file.
diff --git a/articles/azure-resource-manager/troubleshooting/error-storage-account-name.md b/articles/azure-resource-manager/troubleshooting/error-storage-account-name.md
@@ -53,14 +53,15 @@ Code=StorageAccountAlreadyTaken
 Message=The storage account named storageckrexph7isnoc is already taken.
 ```
 
-## Cause
+There are two main causes for this error.
 
-Common reasons for an error are because the storage account name uses invalid characters or is a duplicate name. Storage account names must meet the following criteria:
+## Cause 1
 
-- Length between 3 and 24 characters with only lowercase letters and numbers.
-- Must be globally unique across Azure. Storage account names can't be duplicated in Azure.
-
-## Solution
+The storage account name uses invalid characters or is a duplicate name. Storage account names must meet the following criteria:
+   - Length between 3 and 24 characters with only lowercase letters and numbers.
+   - Must be globally unique across Azure. Storage account names can't be duplicated in Azure.
+  
+## Solution 1
 
 You can create a unique name by concatenating a prefix or suffix with a value from the `uniqueString` function.
 
@@ -129,4 +130,13 @@ name: '${storageNamePrefix}${uniqueString(resourceGroup().id)}'
 "name": "[concat(parameters('storageNamePrefix'), uniquestring(resourceGroup().id))]"
 ```
 
+## Cause 2
+
+The storage account was recently deleted.
+   - If a request to create the storage account comes from a different subscription and tenant than where it was previously located, it will be denied for security purposes as described here, [Prevent dangling DNS entries and avoid subdomain takeover](https://docs.microsoft.com/azure/security/fundamentals/subdomain-takeover). 
+  
+## Solution 2
+
+[Create a Support Request](https://learn.microsoft.com/azure/azure-portal/supportability/how-to-create-azure-support-request#create-a-support-request****) and choose **Create new storage account** for the problem type, and **Failure(s) during new account creation** for the Problem subtype. Please make sure to include the name of the storage account and the approximate time when account creation failed.
+
 ---
diff --git a/articles/dev-box/how-to-configure-intune-conditional-access-policies.md b/articles/dev-box/how-to-configure-intune-conditional-access-policies.md
@@ -120,6 +120,9 @@ You want to allow developer access to the developer portal only. Developers shou
 
 ### Create a new policy
 
+> [!Note]
+> The application **Microsoft Developer Portal** was renamed from **Fidalgo Dev Portal Public**, so it is possible for certain tenants to still see the previous name. Even though they have a different name, they still have the same application ID, and thus it is the right app. If you want to try fixing this, you can delete and re-add the tenant's service principal for the app.
+
 Follow these steps:
 
 1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com/) as at least a [Conditional Access Administrator](/entra/identity/role-based-access-control/permissions-reference#conditional-access-administrator).
diff --git a/articles/expressroute/expressroute-howto-ipsec-transport-private-windows.md b/articles/expressroute/expressroute-howto-ipsec-transport-private-windows.md
@@ -37,7 +37,7 @@ This diagram shows the IPsec tunnels in transit in ExpressRoute private peering.
 ### Working with IPsec policy
 
 In Windows, encryption is associated with IPsec policy. IPsec policy determines which IP traffic is secured and the security mechanism applied to the IP packets.
-**IPSec policies** are composed of the following items: **Filter Lists**, **Filter Actions**, and **Security Rules**.
+**IPsec policies** are composed of the following items: **Filter Lists**, **Filter Actions**, and **Security Rules**.
 
 When configuring IPsec policy, it's important to understand the following IPsec policy terminology:
 
diff --git a/articles/frontdoor/standard-premium/how-to-logs.md b/articles/frontdoor/standard-premium/how-to-logs.md
@@ -41,7 +41,7 @@ Access logs, health probe logs, and Web Application Firewall (WAF) logs aren't e
       * Storage accounts are best used for scenarios when logs are stored for a longer duration and are reviewed when needed.
       * Select the *Subscription* and the *Storage Account*. and set **Retention (days)**.
     * **Stream to an event hub**
-      * Event hubs are a great option for integrating with other security information and event management (SIEM) tools or external data stores, such as Splunk, DataDog, or Sumo. 
+      * Event hubs are a great option for integrating with other security information and event management (SIEM) tools or external data stores, such as Splunk, Datadog, or Sumo. 
       * Select the *Subscription, Event hub namespace, Event hub name (optional)*, and *Event hub policy name*. 
 
     > [!TIP]
diff --git a/articles/managed-grafana/how-to-data-source-plugins-managed-identity.md b/articles/managed-grafana/how-to-data-source-plugins-managed-identity.md
@@ -55,7 +55,7 @@ Within the Standard service tier, users who have subscribed to the Grafana Enter
 * [AppDynamics](https://grafana.com/grafana/plugins/dlopes7-appdynamics-datasource)
 * [Azure DevOps](https://grafana.com/grafana/plugins/grafana-azuredevops-datasource)
 * [Databricks](https://grafana.com/grafana/plugins/grafana-databricks-datasource)
-* [DataDog](https://grafana.com/grafana/plugins/grafana-datadog-datasource)
+* [Datadog](https://grafana.com/grafana/plugins/grafana-datadog-datasource)
 * [Dynatrace](https://grafana.com/grafana/plugins/grafana-dynatrace-datasource)
 * [GitLab](https://grafana.com/grafana/plugins/grafana-gitlab-datasource)
 * [Honeycomb](https://grafana.com/grafana/plugins/grafana-honeycomb-datasource)
diff --git a/articles/synapse-analytics/synapse-link/how-to-connect-synapse-link-cosmos-db.md b/articles/synapse-analytics/synapse-link/how-to-connect-synapse-link-cosmos-db.md
@@ -38,7 +38,7 @@ From the Data Object Explorer, you can directly connect to an Azure Cosmos DB da
 
 1. Select the **+** icon near **Data**.
 1. Select **Connect to external data**.
-1. Select the API that you want to connect to, for example, **SQL API** or **API for MongoDB**.
+1. Select the API that you want to connect to, for example, **CosmosDB for NoSQL** or **CosmosDB API for MongoDB**.
 1. Select **Continue**.
 1. Use a friendly name to name the linked service. The name will appear in the Data Object Explorer and is used by Azure Synapse runtimes to connect to the database and containers.
 1. Select the **Azure Cosmos DB account name** and the **database name**.
