Merge pull request #298258 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 6c489ddb776a · 2025-04-16T00:47:14.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/azure-resource-manager/bicep/parameters.md b/articles/azure-resource-manager/bicep/parameters.md
@@ -150,7 +150,7 @@ param storageAccountName string
 
 When you hover your cursor over **storageAccountName** in Visual Studio Code, you see the formatted text:
 
-:::image type="content" source="./media/parameters/vscode-bicep-extension-description-decorator-markdown.png" alt-text="Use Markdown-formatted text in VSCode":::
+:::image type="content" source="./media/parameters/vscode-bicep-extension-description-decorator-markdown.png" alt-text="Use Markdown-formatted text in VS Code":::
 
 Make sure the text follows proper Markdown formatting; otherwise, it might not display correctly when rendered.
 
diff --git a/articles/azure-resource-manager/templates/definitions.md b/articles/azure-resource-manager/templates/definitions.md
@@ -10,7 +10,7 @@ ms.date: 09/26/2024
 
 This article describes how to create and use definitions in your Azure Resource Manager template (ARM template). By defining your own types, you can reuse these types. Type definitions can only be used with [languageVersion 2.0](./syntax.md#languageversion-20).
 
-[!INCLUDE [VSCode ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
+[!INCLUDE [VS Code ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
 
 > [!TIP]
 > We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [User-defined data types in Bicep](../bicep/user-defined-data-types.md).
diff --git a/articles/azure-resource-manager/templates/parameters.md b/articles/azure-resource-manager/templates/parameters.md
@@ -23,7 +23,7 @@ In addition to minValue, maxValue, minLength, maxLength, and allowedValues, [lan
 - [prefixItems](#prefixitems)
 - [properties](#properties)
 
-[!INCLUDE [VSCode ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
+[!INCLUDE [VS Code ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
 
 > [!TIP]
 > We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [parameters](../bicep/parameters.md).
diff --git a/articles/azure-resource-manager/templates/quickstart-create-templates-use-visual-studio-code.md b/articles/azure-resource-manager/templates/quickstart-create-templates-use-visual-studio-code.md
@@ -20,7 +20,7 @@ If you don't have an Azure subscription, [create a free account](https://azure.m
 > [!TIP]
 > We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [Quickstart: Create Bicep files with Visual Studio Code](../bicep/quickstart-create-bicep-use-visual-studio-code.md).
 
-[!INCLUDE [VSCode ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
+[!INCLUDE [VS Code ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
 
 ## Create an ARM template
 
diff --git a/articles/azure-resource-manager/templates/resource-declaration.md b/articles/azure-resource-manager/templates/resource-declaration.md
@@ -16,7 +16,7 @@ To deploy a resource through an Azure Resource Manager template (ARM template),
 
 
 
-[!INCLUDE [VSCode ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
+[!INCLUDE [VS Code ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
 
 > [!TIP]
 > We recommend [Bicep](../bicep/overview.md) because it offers the same capabilities as ARM templates and the syntax is easier to use. To learn more, see [resource declaration](../bicep/resource-declaration.md).
diff --git a/articles/azure-resource-manager/templates/syntax.md b/articles/azure-resource-manager/templates/syntax.md
@@ -508,7 +508,7 @@ In Bicep, see [multi-line strings](../bicep/file.md#multi-line-strings).
 > [!NOTE]
 > Using any `languageVersion` that ends in `-experimental` is not recommended in production environments because experimental functionality could be changed at any time.
 
-[!INCLUDE [VSCode ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
+[!INCLUDE [VS Code ARM Tools extension doesn't support languageVersion 2.0](../../../includes/resource-manager-vscode-language-version-20.md)]
 
 To use languageVersion 2.0, add `"languageVersion": "2.0"` to your template:
 
diff --git a/articles/azure-web-pubsub/quickstart-use-sdk.md b/articles/azure-web-pubsub/quickstart-use-sdk.md
@@ -19,7 +19,7 @@ Azure Web PubSub helps you manage WebSocket clients. This quickstart shows you h
 
 - An Azure subscription, if you don't have one, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 - a Bash and PowerShell command shell. The Python, JavaScript and Java samples require a Bash command shell.
-- A file editor such as VSCode.
+- A file editor such as VS Code.
 - Azure CLI: [install the Azure CLI](/cli/azure/install-azure-cli)
 
 If creating the project on a local machine, you'll need to install the dependencies for the language you're using:
diff --git a/articles/databox-online/azure-stack-edge-gpu-create-iot-edge-module.md b/articles/databox-online/azure-stack-edge-gpu-create-iot-edge-module.md
@@ -241,7 +241,7 @@ Create a C# solution template that you can customize with your own code.
 
 In the previous section, you created an IoT Edge solution and added code to the FileCopyModule to copy files from local share to the cloud share. Now you need to build the solution as a container image and push it to your container registry.
 
-1. In VSCode, go to Terminal > New Terminal to open a new Visual Studio Code integrated terminal.
+1. In VS Code, go to Terminal > New Terminal to open a new Visual Studio Code integrated terminal.
 2. Sign in to Docker by entering the following command in the integrated terminal.
 
     `docker login <ACR login server> -u <ACR username>`
diff --git a/articles/hdinsight/hdinsight-migrate-granular-access-cluster-configurations.md b/articles/hdinsight/hdinsight-migrate-granular-access-cluster-configurations.md
@@ -198,6 +198,6 @@ If it still does not work, contact your Microsoft Entra admin to acquire the cor
 
 Beginning on September 3, 2019, `GET /configurations` and `POST /configurations/gateway` calls will no longer return any information and the `GET /configurations/{configurationName}` call will no longer return sensitive parameters, such as storage account keys or the cluster password. The same is true of corresponding SDK methods and PowerShell cmdlets.
 
-If you are using an older version of one of the tools for Visual Studio, VSCode, IntelliJ or Eclipse mentioned, it is no longer function until you update.
+If you are using an older version of one of the tools for Visual Studio, VS Code, IntelliJ or Eclipse mentioned, it is no longer function until you update.
 
 For more detailed information, see the corresponding section of this document for your scenario.
diff --git a/articles/hdinsight/hdinsight-troubleshoot-guide.md b/articles/hdinsight/hdinsight-troubleshoot-guide.md
@@ -13,7 +13,7 @@ ms.date: 09/06/2024
 |:::image type="content" source="./media/hdinsight-troubleshoot-guide/hdinsight-apache-hbase.png" alt-text="hdinsight apache HBase icon icon." border="false":::<br>[Troubleshoot Apache HBase]()|<br>[Unassigned regions](hbase/hbase-troubleshoot-unassigned-regions.md#scenario-unassigned-regions)<br><br>[Timeouts with 'hbase hbck' command in Azure HDInsight](hbase/hbase-troubleshoot-timeouts-hbase-hbck.md)<br><br>[Apache Phoenix connectivity issues in Azure HDInsight](hbase/hbase-troubleshoot-phoenix-connectivity.md)<br><br>[What causes a primary server to fail to start?](hbase/hbase-troubleshoot-start-fails.md)<br><br>[BindException - Address already in use](hbase/hbase-troubleshoot-bindexception-address-use.md)|
 |:::image type="content" source="./media/hdinsight-troubleshoot-guide/hdinsight-apache-hdfs.png" alt-text="hdinsight apache hdfs icon icon." border="false":::<br>[Troubleshoot Apache Hadoop HDFS](hdinsight-troubleshoot-hdfs.md)|<br>[How do I access a local HDFS from inside a cluster?](hdinsight-troubleshoot-hdfs.md#how-do-i-access-local-hdfs-from-inside-a-cluster)<br><br>[Local HDFS stuck in safe mode on Azure HDInsight cluster](hadoop/hdinsight-hdfs-troubleshoot-safe-mode.md)|
 |:::image type="content" source="./media/hdinsight-troubleshoot-guide/hdinsight-apache-hive.png" alt-text="hdinsight apache Hive icon icon." border="false":::<br>[Troubleshoot Apache Hive](hdinsight-troubleshoot-hive.md)|<br>[How do I export a Hive metastore and import it on another cluster?](hdinsight-troubleshoot-hive.md#how-do-i-export-a-hive-metastore-and-import-it-on-another-cluster)<br><br>[How do I locate Apache Hive logs on a cluster?](hdinsight-troubleshoot-hive.md#how-do-i-locate-hive-logs-on-a-cluster)<br><br>[How do I launch the Apache Hive shell with specific configurations on a cluster?](hdinsight-troubleshoot-hive.md#how-do-i-launch-the-hive-shell-with-specific-configurations-on-a-cluster)<br><br>[How do I analyze Apache Tez DAG data on a cluster-critical path?](hdinsight-troubleshoot-hive.md#how-do-i-analyze-tez-dag-data-on-a-cluster-critical-path)<br><br>[How do I download Apache Tez DAG data from a cluster?](hdinsight-troubleshoot-hive.md#how-do-i-download-tez-dag-data-from-a-cluster)|
-|:::image type="content" source="./media/hdinsight-troubleshoot-guide/hdinsight-apache-spark.png" alt-text="hdinsight apache Spark icon icon." border="false":::<br>[Troubleshoot Apache Spark](./spark/apache-troubleshoot-spark.md)|<br>[How do I configure an Apache Spark application by using Apache Ambari on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-apache-ambari-on-clusters)<br><br>[How do I configure an Apache Spark application by using a Jupyter Notebook on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-a-jupyter-notebook-on-clusters)<br><br>[How do I configure an Apache Spark application by using Apache Livy on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-apache-livy-on-clusters)<br><br>[How do I configure an Apache Spark application by using spark-submit on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-spark-submit-on-clusters)<br><br>[How do I configure an Apache Spark application by using IntelliJ?](spark/apache-spark-intellij-tool-plugin.md)<br><br>[How do I configure an Apache Spark application by using Eclipse?](spark/apache-spark-eclipse-tool-plugin.md)<br><br>[How do I configure an Apache Spark application by using VSCode?](hdinsight-for-vscode.md)<br><br>[OutOfMemoryError exception for Apache Spark](spark/apache-spark-troubleshoot-outofmemory.md#scenario-outofmemoryerror-exception-for-apache-spark)|
+|:::image type="content" source="./media/hdinsight-troubleshoot-guide/hdinsight-apache-spark.png" alt-text="hdinsight apache Spark icon icon." border="false":::<br>[Troubleshoot Apache Spark](./spark/apache-troubleshoot-spark.md)|<br>[How do I configure an Apache Spark application by using Apache Ambari on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-apache-ambari-on-clusters)<br><br>[How do I configure an Apache Spark application by using a Jupyter Notebook on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-a-jupyter-notebook-on-clusters)<br><br>[How do I configure an Apache Spark application by using Apache Livy on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-apache-livy-on-clusters)<br><br>[How do I configure an Apache Spark application by using spark-submit on clusters?](spark/apache-troubleshoot-spark.md#how-do-i-configure-an-apache-spark-application-by-using-spark-submit-on-clusters)<br><br>[How do I configure an Apache Spark application by using IntelliJ?](spark/apache-spark-intellij-tool-plugin.md)<br><br>[How do I configure an Apache Spark application by using Eclipse?](spark/apache-spark-eclipse-tool-plugin.md)<br><br>[How do I configure an Apache Spark application by using VS Code?](hdinsight-for-vscode.md)<br><br>[OutOfMemoryError exception for Apache Spark](spark/apache-spark-troubleshoot-outofmemory.md#scenario-outofmemoryerror-exception-for-apache-spark)|
 |:::image type="content" source="./media/hdinsight-troubleshoot-guide/hdinsight-apache-yarn.png" alt-text="hdinsight apache YARN icon icon." border="false":::<br>[Troubleshoot Apache Hadoop YARN](hdinsight-troubleshoot-YARN.md)|<br>[How do I create a new Apache Hadoop YARN queue on a cluster?](hdinsight-troubleshoot-yarn.md#how-do-i-create-a-new-yarn-queue-on-a-cluster)<br><br>[How do I download Apache Hadoop YARN logs from a cluster?](hdinsight-troubleshoot-yarn.md#how-do-i-download-yarn-logs-from-a-cluster)|
 
 ## HDInsight troubleshooting resources
@@ -23,7 +23,7 @@ ms.date: 09/06/2024
 | HDInsight on Linux and optimization | - [Information about using HDInsight on Linux](hdinsight-hadoop-linux-information.md)<br>- [Apache Hadoop memory and performance troubleshooting](hdinsight-hadoop-stack-trace-error-messages.md) |
 | Logs and dumps | - [Access Apache Hadoop YARN application logs on Linux](hdinsight-hadoop-access-yarn-app-logs-linux.md)<br>- [Enable heap dumps for Apache Hadoop services on Linux](hdinsight-hadoop-collect-debug-heap-dump-linux.md)|
 | Errors | - [Understand and resolve WebHCat errors](hdinsight-hadoop-templeton-webhcat-debug-errors.md)<br>- [Apache Hive settings to fix OutofMemory error](hdinsight-hadoop-hive-out-of-memory-error-oom.md) |
-| Tools | - [Optimize Apache Hive queries](hdinsight-hadoop-optimize-hive-query.md)<br>- [HDInsight IntelliJ tool](./spark/apache-spark-intellij-tool-plugin.md)<br>- [HDInsight Eclipse tool](./spark/apache-spark-eclipse-tool-plugin.md)<br>- [HDInsight VSCode tool](hdinsight-for-vscode.md)<br>- [HDInsight Visual Studio tool](./hadoop/apache-hadoop-visual-studio-tools-get-started.md) |
+| Tools | - [Optimize Apache Hive queries](hdinsight-hadoop-optimize-hive-query.md)<br>- [HDInsight IntelliJ tool](./spark/apache-spark-intellij-tool-plugin.md)<br>- [HDInsight Eclipse tool](./spark/apache-spark-eclipse-tool-plugin.md)<br>- [HDInsight VS Code tool](hdinsight-for-vscode.md)<br>- [HDInsight Visual Studio tool](./hadoop/apache-hadoop-visual-studio-tools-get-started.md) |
 
 ## Next steps
 
diff --git a/articles/healthcare-apis/fhir/using-rest-client.md b/articles/healthcare-apis/fhir/using-rest-client.md
@@ -17,7 +17,7 @@ In this article, you learn how to access Azure Health Data Services using [REST
 
 Select the Extensions icon on the left side panel of your Visual Studio Code, and search for "REST Client". Find the [REST Client extension](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) and install.
 
-[![REST Client VSCode extension](media/rest-install.png)](media/rest-install.png#lightbox)
+[![REST Client VS Code extension](media/rest-install.png)](media/rest-install.png#lightbox)
 
 ## Create a `.http` file and define variables
 
diff --git a/articles/load-testing/how-to-create-and-run-load-test-with-jmeter-script.md b/articles/load-testing/how-to-create-and-run-load-test-with-jmeter-script.md
@@ -67,7 +67,7 @@ To create a load test using an existing JMeter script in the Azure portal:
     :::image type="content" source="./media/how-to-create-and-run-load-test-with-jmeter-script/create-new-test-test-plan.png" alt-text="Screenshot that shows the Test plan tab." lightbox="./media/how-to-create-and-run-load-test-with-jmeter-script/create-new-test-test-plan.png":::
     
     > [!NOTE]
-    > You can upload additional JMeter configuration files or other files that you reference in the JMX file. For example, if your test script uses CSV data sets, you can upload the corresponding *.csv* file(s). See also how to [read data from a CSV file](./how-to-read-csv-data.md). For files other than the main test script and user properties, if the size of the file is greater than 50 MB, zip the file. The size of the zip file should be below 50 MB. Azure Load Testing automatically unzips the file during the test run. Only five zip artifacts are allowed with a maximum of 1000 files in each zip and an uncompressed total size of 1 GB.
+    > You can upload additional JMeter configuration files or other files that you reference in the JMX file. For example, if your test script uses CSV data sets, you can upload the corresponding *.csv* file(s). See also how to [read data from a CSV file](./how-to-read-csv-data.md). For files other than the main test script and user properties, if the size of the file is greater than 50 MB, zip the file. The size of the zip file should be below 50 MB. Azure Load Testing automatically unzips the file during the test run. Only 100 zip artifacts are allowed with a maximum of 10000 files in each zip and an uncompressed total size of 1 GB.
 
 1. Select **Review + create**. Review all settings, and then select **Create** to create the load test.
 
diff --git a/articles/load-testing/resource-limits-quotas-capacity.md b/articles/load-testing/resource-limits-quotas-capacity.md
@@ -43,11 +43,19 @@ The following limits apply on a per-region, per-subscription basis.
 | Tests per resource | 10000 | |
 | Test runs per test | 5000 | |
 | File uploads per test | 1000 | |
+| Zip file uploads per test | 100 | |
 | App Components per test or test run | 100 | |
 | [Test criteria](./how-to-define-test-criteria.md#load-test-fail-criteria) per test | 50 | |
 
 <sup>2</sup> If you aren't already at the maximum limit, you can request an increase. We aren't currently able to approve increase requests past our maximum limitations stated above. To request an increase for your default limit, contact Azure Support. Default limits vary by offer category type.
 
+### Notifications
+The following limits apply on a per-region, per-subscription basis.
+| Resource  | Default limit |  Maximum limit |
+|---------| ---------: | ---------: |
+|Tests per notification rule  | 20 | |
+|Action groups per notification rule| 5| 
+
 ### Data retention
 
 Azure Load Testing captures metrics, test results, and logs for each test run. The following data retention limits apply:
diff --git a/articles/remote-rendering/tutorials/modeling/maya-material-setup.md b/articles/remote-rendering/tutorials/modeling/maya-material-setup.md
@@ -42,7 +42,7 @@ Azure Remote Rendering uses meters for measurement and the up direction is the Y
 
 ![Object names](media/object-names.jpg)
 
-After you create or acquire some textures, you can also create unique textures. You can use texturing apps such as Quixel Suite, PhotoShop, or Substance Suite or get generic tiling textures from other sources.
+After you create or acquire some textures, you can also create unique textures. You can use texturing apps such as Quixel Suite, Photoshop, or Substance Suite or get generic tiling textures from other sources.
 
 To apply textures to your model:
 
diff --git a/articles/sentinel/data-connectors/crowdstrike-falcon-data-replicator-v2.md b/articles/sentinel/data-connectors/crowdstrike-falcon-data-replicator-v2.md
@@ -95,7 +95,7 @@ Use the following step-by-step instructions to deploy the Crowdstrike Falcon Dat
 **2. Deploy a Function App**
 
 1. Download the [Azure Function App](https://aka.ms/sentinel-CrowdstrikeReplicatorV2-functionapp) file. Extract archive to your local development computer.
-2. Follow the [function app manual deployment instructions](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AzureFunctionsManualDeployment.md#function-app-manual-deployment-instructions) to deploy the Azure Functions app using VSCode.
+2. Follow the [function app manual deployment instructions](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AzureFunctionsManualDeployment.md#function-app-manual-deployment-instructions) to deploy the Azure Functions app using VS Code.
 3. After successful deployment of the function app, follow next steps for configuring it.
 
 
diff --git a/articles/sentinel/data-connectors/illumio-saas.md b/articles/sentinel/data-connectors/illumio-saas.md
@@ -105,7 +105,7 @@ Deployment via Visual Studio Code.
 **1. Deploy a Function App**
 
 1. Download the [Azure Function App](https://github.com/Azure/Azure-Sentinel/raw/master/Solutions/IllumioSaaS/Data%20Connectors/IllumioEventsConn.zip) file. Extract archive to your local development computer.
-2. Follow the [function app manual deployment instructions](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AzureFunctionsManualDeployment.md#function-app-manual-deployment-instructions) to deploy the Azure Functions app using VSCode.
+2. Follow the [function app manual deployment instructions](https://github.com/Azure/Azure-Sentinel/blob/master/DataConnectors/AzureFunctionsManualDeployment.md#function-app-manual-deployment-instructions) to deploy the Azure Functions app using VS Code.
 3. After successful deployment of the function app, follow next steps for configuring it.
 
 
diff --git a/articles/stream-analytics/visual-studio-code-explore-jobs.md b/articles/stream-analytics/visual-studio-code-explore-jobs.md
diff --git a/articles/stream-analytics/visual-studio-code-local-run-live-input.md b/articles/stream-analytics/visual-studio-code-local-run-live-input.md
