Merge pull request #191684 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 948ec7bfe577 · 2022-03-15T09:53:11.000-07: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/cloud-infrastructure-entitlement-management/cloudknox-product-data-sources.md b/articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-product-data-sources.md
@@ -62,7 +62,7 @@ You can use the **Data Collectors** dashboard in CloudKnox Permissions Managemen
 1. Select the ellipses **(...)** at the end of the row in the table.
 1. Select **Edit Configuration**. 
 
-    The **M-CIEM Onboarding - Summary** box displays.
+    The **CloudKnox Onboarding - Summary** box displays.
 
 1. Select **Edit** (the pencil icon) for each field you want to change. 
 1. Select **Verify now & save**.
diff --git a/articles/active-directory/standards/memo-22-09-meet-identity-requirements.md b/articles/active-directory/standards/memo-22-09-meet-identity-requirements.md
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
 
 # Meeting identity requirements of Memorandum 22-09 with Azure Active Directory
 
-This series of articles offer guidance for employing Azure Active Directory (Azure AD) as a centralized identity management system for implementing Zero Trust principles as described by the US Federal Government’s Office of Management and Budget (OMB) [Memorandum M-22-09](https://www.whitehouse.gov/wp-content/uploads/2022/01/M-22-09.pdf). Throughout this document wee refer to it as "The memo."
+This series of articles offer guidance for employing Azure Active Directory (Azure AD) as a centralized identity management system for implementing Zero Trust principles as described by the US Federal Government’s Office of Management and Budget (OMB) [Memorandum M-22-09](https://www.whitehouse.gov/wp-content/uploads/2022/01/M-22-09.pdf). Throughout this document we refer to it as "The memo."
 
 The release of Memorandum 22-09 is designed to support Zero trust initiatives within federal agencies; it also provides regulatory guidance in supporting Federal Cybersecurity and Data Privacy Laws. The Memo cites the [Department of Defense (DoD) Zero Trust Reference Architecture](https://dodcio.defense.gov/Portals/0/Documents/Library/(U)ZT_RA_v1.1(U)_Mar21.pdf), 
 
diff --git a/articles/applied-ai-services/form-recognizer/includes/get-started/java.md b/articles/applied-ai-services/form-recognizer/includes/get-started/java.md
@@ -92,7 +92,7 @@ You will create the following directory structure:
 
 :::image type="content" source="../../media/quickstarts/java-directories.png" alt-text="Screenshot: Java directory structure":::
 
-Navigate to the java directory and create a file called *FormRecognizer.java*.  Open it in your preferred editor or IDE and add the following package declaration and  `import` statements:
+Navigate to the Java directory and create a file called *FormRecognizer.java*.  Open it in your preferred editor or IDE and add the following package declaration and `import` statements:
 
 ```java
 import com.azure.ai.formrecognizer.*;
diff --git a/articles/azure-functions/bring-dependency-to-functions.md b/articles/azure-functions/bring-dependency-to-functions.md
@@ -84,7 +84,7 @@ One of the simplest ways to bring in dependencies is to put the files/artifact t
  | - local.settings.json
  | - pom.xml
 ```
-For java specifically, you need to specifically include the artifacts into the build/target folder when copying resources. Here's  an example on how to do it in Maven:
+For Java specifically, you need to specifically include the artifacts into the build/target folder when copying resources. Here's an example on how to do it in Maven:
 
 ```xml
 ...
diff --git a/articles/azure-functions/functions-how-to-github-actions.md b/articles/azure-functions/functions-how-to-github-actions.md
@@ -330,7 +330,7 @@ env:
   AZURE_FUNCTIONAPP_NAME: your-app-name      # set this to your function app name on Azure
   POM_XML_DIRECTORY: '.'                     # set this to the directory which contains pom.xml file
   POM_FUNCTIONAPP_NAME: your-app-name        # set this to the function app name in your local development environment
-  JAVA_VERSION: '1.8.x'                      # set this to the java version to use
+  JAVA_VERSION: '1.8.x'                      # set this to the Java version to use
 
 jobs:
   build-and-deploy:
diff --git a/articles/azure-functions/functions-versions.md b/articles/azure-functions/functions-versions.md
@@ -149,6 +149,8 @@ The following are some changes to be aware of before upgrading a 3.x app to 4.x.
 
 - Default and maximum timeouts are now enforced in 4.x Linux consumption function apps. ([#1915](https://github.com/Azure/Azure-Functions/issues/1915))
 
+- Azure Functions 4.x uses Azure.Identity and Azure.Security.KeyVault.Secrets for the Key Vault provider and has deprecated the use of Microsoft.Azure.KeyVault. See the Key Vault option in [Secret Repositories](security-concepts.md#secret-repositories) for more information on how to configure function app settings. ([#2048](https://github.com/Azure/Azure-Functions/issues/2048))
+
 - Function apps that share storage accounts will fail to start if their computed hostnames are the same. Use a separate storage account for each function app. ([#2049](https://github.com/Azure/Azure-Functions/issues/2049))
 
 ::: zone pivot="programming-language-csharp" 
diff --git a/articles/azure-monitor/app/java-standalone-troubleshoot.md b/articles/azure-monitor/app/java-standalone-troubleshoot.md
@@ -177,7 +177,7 @@ In this case, the server side is the Application Insights ingestion endpoint or
 
 #### How to add the missing cipher suites:
 
-If using Java 9 or later, please check if the JVM has `jdk.crypto.cryptoki` module included in the jmods folder. Also if you are building a custom java runtime using `jlink` please make sure to include the same module.
+If using Java 9 or later, please check if the JVM has `jdk.crypto.cryptoki` module included in the jmods folder. Also if you are building a custom Java runtime using `jlink` please make sure to include the same module.
 
 Otherwise, these cipher suites should already be part of modern Java 8+ distributions,
 so it is recommended to check where you installed your Java distribution from, and investigate why the security
diff --git a/articles/azure-resource-manager/bicep/overview.md b/articles/azure-resource-manager/bicep/overview.md
@@ -2,14 +2,14 @@
 title: Bicep language for deploying Azure resources
 description: Describes the Bicep language for deploying infrastructure to Azure. It provides an improved authoring experience over using JSON to develop templates.
 ms.topic: conceptual
-ms.date: 01/21/2022
+ms.date: 03/14/2022
 ---
 
 # What is Bicep?
 
 Bicep is a domain-specific language (DSL) that uses declarative syntax to deploy Azure resources. In a Bicep file, you define the infrastructure you want to deploy to Azure, and then use that file throughout the development lifecycle to repeatedly deploy your infrastructure. Your resources are deployed in a consistent manner.
 
-Bicep provides concise syntax, reliable type safety, and support for code reuse. We believe Bicep offers the best authoring experience for your [infrastructure-as-code](/devops/deliver/what-is-infrastructure-as-code) solutions in Azure.
+Bicep provides concise syntax, reliable type safety, and support for code reuse. Bicep offers a first-class authoring experience for your [infrastructure-as-code](/devops/deliver/what-is-infrastructure-as-code) solutions in Azure.
 
 ## Benefits of Bicep
 
diff --git a/articles/azure-resource-manager/management/resource-name-rules.md b/articles/azure-resource-manager/management/resource-name-rules.md
@@ -747,7 +747,7 @@ In the following tables, the term alphanumeric refers to:
 > | --- | --- | --- | --- |
 > | workspaces | global | 1-50 | Lowercase letters, hyphens, and numbers.<br><br>Start and end with letter or number.<br><br>Can't contain `-ondemand` |
 > | workspaces / bigDataPools | workspace | 1-15 | Letters and numbers.<br><br>Start with letter. End with letter or number.<br><br>Can't contain [reserved word](../troubleshooting/error-reserved-resource-name.md). |
-> | workspaces / sqlPools | workspace | 1-60 | Can't contain `<>*%&:\/?@-` or control characters.<br><br>Can't end with `.` or space.<br><br>Can't contain [reserved word](../troubleshooting/error-reserved-resource-name.md). |
+> | workspaces / sqlPools | workspace | 1-15  |  Can contain only letters, numbers, or underscore.<br><br>Can't contain [reserved word](../troubleshooting/error-reserved-resource-name.md). |
 
 ## Microsoft.TimeSeriesInsights
 
diff --git a/articles/azure-signalr/signalr-quickstart-azure-functions-java.md b/articles/azure-signalr/signalr-quickstart-azure-functions-java.md
@@ -50,7 +50,7 @@ Having issues? Try the [troubleshooting guide](signalr-howto-troubleshoot-guide.
 
 ## Configure and run the Azure Function app
 
-1. Make sure you have Azure Function Core Tools, java (version 11 in the sample) and maven installed.
+1. Make sure you have Azure Function Core Tools, Java (version 11 in the sample) and maven installed.
     
     ```bash
     mvn archetype:generate -DarchetypeGroupId=com.microsoft.azure -DarchetypeArtifactId=azure-functions-archetype -DjavaVersion=11
diff --git a/articles/cosmos-db/cassandra/glowroot-cassandra.md b/articles/cosmos-db/cassandra/glowroot-cassandra.md
@@ -21,7 +21,7 @@ Glowroot is an application performance management tool used to optimize and moni
 * [Install JAVA (version 8) for Windows](https://developers.redhat.com/products/openjdk/download)
 > [!NOTE]
 > Note that there are certain known incompatible build targets with newer versions. If you already have a newer version of JAVA, you can still download JDK8.
-> If you have newer JAVA installed in addition to JDK8: Set the %JAVA_HOME% variable in the local command prompt to target JDK8. This will only change java version for the current session and leave global machine settings intact. 
+> If you have newer JAVA installed in addition to JDK8: Set the %JAVA_HOME% variable in the local command prompt to target JDK8. This will only change Java version for the current session and leave global machine settings intact. 
 * [Install maven](https://maven.apache.org/download.cgi)
     * Verify successful installation by running: `mvn --version`
 
diff --git a/articles/cosmos-db/cassandra/load-data-table.md b/articles/cosmos-db/cassandra/load-data-table.md
@@ -1,6 +1,6 @@
 ---
 title: 'Tutorial: Java app to load sample data into a Cassandra API table in Azure Cosmos DB' 
-description: This tutorial shows how to load sample user data to a Cassandra API table in Azure Cosmos DB by using a java application.
+description: This tutorial shows how to load sample user data to a Cassandra API table in Azure Cosmos DB by using a Java application.
 ms.service: cosmos-db
 ms.subservice: cosmosdb-cassandra
 ms.topic: tutorial
diff --git a/articles/cosmos-db/sql/migrate-dotnet-v3.md b/articles/cosmos-db/sql/migrate-dotnet-v3.md
@@ -146,10 +146,10 @@ CosmosClient client = cosmosClientBuilder.Build();
 
 ### Exceptions
 
-Where the v2 SDK used `DocumentClientException` to signal errors during operations, the v3 SDK uses `CosmosClientException`, which exposes the `StatusCode`, `Diagnostics`, and other response-related information. All the complete information is serialized when `ToString()` is used:
+Where the v2 SDK used `DocumentClientException` to signal errors during operations, the v3 SDK uses `CosmosException`, which exposes the `StatusCode`, `Diagnostics`, and other response-related information. All the complete information is serialized when `ToString()` is used:
 
 ```csharp
-catch (CosmosClientException ex)
+catch (CosmosException ex)
 {
     HttpStatusCode statusCode = ex.StatusCode;
     CosmosDiagnostics diagnostics = ex.Diagnostics;
diff --git a/articles/iot-central/core/howto-configure-rules-advanced.md b/articles/iot-central/core/howto-configure-rules-advanced.md
@@ -107,7 +107,7 @@ Use this action to execute a command defined in one of the device's interfaces.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to execute a command. |
 | Device Component | The interface in the device template that contains the command. |
 | Device Command | Choose one of the commands on the selected interface. |
 | Device Template | Choose from the list of device templates in your IoT Central application. |
@@ -123,7 +123,7 @@ Use this action to retrieve the device's details.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to get the details. |
 
 You can use the returned details in the dynamic expressions in other actions. The device details returned include: **Approved**, **body**, **Device Description**, **Device Name**, **Device Template**, **Provisioned**, and **Simulated**.
 
@@ -134,7 +134,7 @@ Use this action to retrieve the cloud property values for a specific device.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to get the cloud properties. |
 | Device Template | Choose from the list of device templates in your IoT Central application. |
 
 You can use the returned cloud property values in the dynamic expressions in other actions.
@@ -146,7 +146,7 @@ Use this action to retrieve the property values for a specific device.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to get the properties. |
 | Device Template | Choose from the list of device templates in your IoT Central application. |
 
 You can use the returned property values in the dynamic expressions in other actions.
@@ -158,7 +158,7 @@ Use this action to retrieve the telemetry values for a specific device.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to get the telemetry values. |
 | Device Template | Choose from the list of device templates in your IoT Central application. |
 
 You can use the returned telemetry values in the dynamic expressions in other actions.
@@ -170,7 +170,7 @@ Use this action to update cloud property values for a specific device.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to update. |
 | Device Template | Choose from the list of device templates in your IoT Central application. |
 | Cloud properties | After you choose a device template, a field is added for each cloud property defined in the template. |
 
@@ -181,10 +181,10 @@ Use this action to update writable property values for a specific device.
 | Field | Description |
 | ----- | ----------- |
 | Application | Choose from your list of IoT Central applications. |
-| Device | The unique ID of the device to delete. |
+| Device | The unique ID of the device to update. |
 | Device Template | Choose from the list of device templates in your IoT Central application. |
 | Writable properties | After you choose a device template, a field is added for each writable property defined in the template. |
 
 ## Next steps
 
-Now that you've learned how to create an advanced rule in your Azure IoT Central application, you can learn how to [Analyze device data in your Azure IoT Central application](howto-create-analytics.md)
+Now that you've learned how to create an advanced rule in your Azure IoT Central application, you can learn how to [Analyze device data in your Azure IoT Central application](howto-create-analytics.md)
diff --git a/articles/machine-learning/how-to-access-azureml-behind-firewall.md b/articles/machine-learning/how-to-access-azureml-behind-firewall.md
@@ -75,15 +75,15 @@ These rule collections are described in more detail in [What are some Azure Fire
     | AzureResourceManager | TCP | 443 |
     | Storage.region       | TCP | 443 |
     | AzureFrontDoor.FrontEnd</br>* Not needed in Azure China. | TCP | 443 | 
-    | ContainerRegistry.region  | TCP | 443 |
+    | AzureContainerRegistry.region  | TCP | 443 |
     | MicrosoftContainerRegistry.region | TCP | 443 |
-    | Keyvault.region | TCP | 443 |
+    | AzureKeyVault.region | TCP | 443 |
 
     > [!TIP]
-    > * ContainerRegistry.region is only needed for custom Docker images. Including small modifications (such as additional packages) to base images provided by Microsoft.
+    > * AzureContainerRegistry.region is only needed for custom Docker images. Including small modifications (such as additional packages) to base images provided by Microsoft.
     > * MicrosoftContainerRegistry.region is only needed if you plan on using the _default Docker images provided by Microsoft_, and _enabling user-managed dependencies_.
-    > * Keyvault.region is only needed if your workspace was created with the [hbi_workspace](/python/api/azureml-core/azureml.core.workspace%28class%29#create-name--auth-none--subscription-id-none--resource-group-none--location-none--create-resource-group-true--sku--basic---friendly-name-none--storage-account-none--key-vault-none--app-insights-none--container-registry-none--cmk-keyvault-none--resource-cmk-uri-none--hbi-workspace-false--default-cpu-compute-target-none--default-gpu-compute-target-none--exist-ok-false--show-output-true-) flag enabled.
-    > * For entries that contain `region`, replace with the Azure region that you're using. For example, `ContainerRegistry.westus`.
+    > * AzureKeyVault.region is only needed if your workspace was created with the [hbi_workspace](/python/api/azureml-core/azureml.core.workspace%28class%29#create-name--auth-none--subscription-id-none--resource-group-none--location-none--create-resource-group-true--sku--basic---friendly-name-none--storage-account-none--key-vault-none--app-insights-none--container-registry-none--cmk-keyvault-none--resource-cmk-uri-none--hbi-workspace-false--default-cpu-compute-target-none--default-gpu-compute-target-none--exist-ok-false--show-output-true-) flag enabled.
+    > * For entries that contain `region`, replace with the Azure region that you're using. For example, `AzureContainerRegistry.westus`.
 
 1. Add __Application rules__ for the following hosts:
 
diff --git a/articles/storage/blobs/query-acceleration-sql-reference.md b/articles/storage/blobs/query-acceleration-sql-reference.md
@@ -240,7 +240,7 @@ A SELECT statement may contain either one or more projection expressions or a si
 |--|--|
 |[COUNT(\*)](/sql/t-sql/functions/count-transact-sql)    |Returns the number of records which matched the predicate expression.|
 |[COUNT(expression)](/sql/t-sql/functions/count-transact-sql)    |Returns the number of records for which expression is non-null.|
-|[AVERAGE(expression)](/sql/t-sql/functions/avg-transact-sql)    |Returns the average of the non-null values of expression.|
+|[AVG(expression)](/sql/t-sql/functions/avg-transact-sql)    |Returns the average of the non-null values of expression.|
 |[MIN(expression)](/sql/t-sql/functions/min-transact-sql)    |Returns the minimum non-null value of expression.|
 |[MAX(expression](/sql/t-sql/functions/max-transact-sql)    |Returns the maximum non-null value of expression.|
 |[SUM(expression)](/sql/t-sql/functions/sum-transact-sql)    |Returns the sum of all non-null values of expression.|
diff --git a/articles/storage/blobs/storage-how-to-mount-container-linux.md b/articles/storage/blobs/storage-how-to-mount-container-linux.md
@@ -25,7 +25,7 @@ This guide shows you how to use blobfuse, and mount a Blob storage container on
 
 ## Install blobfuse on Linux
 
-Blobfuse binaries are available on [the Microsoft software repositories for Linux](/windows-server/administration/Linux-Package-Repository-for-Microsoft-Software) for Ubuntu, Debian, SUSE, CentoOS, Oracle Linux and RHEL distributions. To install blobfuse on those distributions, configure one of the repositories from the list. You can also build the binaries from source code following the [Azure Storage installation steps](https://github.com/Azure/azure-storage-fuse/wiki/1.-Installation#option-2---build-from-source) if there are no binaries available for your distribution.
+Blobfuse binaries are available on [the Microsoft software repositories for Linux](/windows-server/administration/Linux-Package-Repository-for-Microsoft-Software) for Ubuntu, Debian, SUSE, CentOS, Oracle Linux and RHEL distributions. To install blobfuse on those distributions, configure one of the repositories from the list. You can also build the binaries from source code following the [Azure Storage installation steps](https://github.com/Azure/azure-storage-fuse/wiki/1.-Installation#option-2---build-from-source) if there are no binaries available for your distribution.
 
 Blobfuse is published in the Linux repo for Ubuntu versions: 16.04, 18.04, and 20.04, RHELversions: 7.5, 7.8, 8.0, 8.1, 8.2, CentOS versions: 7.0, 8.0, Debian versions: 9.0, 10.0, SUSE version: 15, OracleLinux  8.1 . Run this command to make sure that you have one of those versions deployed:
 
diff --git a/articles/storage/tables/table-storage-design-patterns.md b/articles/storage/tables/table-storage-design-patterns.md
@@ -18,7 +18,7 @@ This article describes some patterns appropriate for use with Table service solu
 
 ![to look up related data](media/storage-table-design-guide/storage-table-design-IMAGE05.png)
 
-The pattern map above highlights some relationships between patterns (blue) and anti-patterns (orange) that are documented in this guide. There are of many other patterns that are worth considering. For example, one of the key scenarios for Table Service is to use the [Materialized View Pattern](/previous-versions/msp-n-p/dn589782(v=pandp.10)) from the [Command Query Responsibility Segregation (CQRS)](/previous-versions/msp-n-p/jj554200(v=pandp.10)) pattern.  
+The pattern map above highlights some relationships between patterns (blue) and anti-patterns (orange) that are documented in this guide. There are many other patterns that are worth considering. For example, one of the key scenarios for Table Service is to use the [Materialized View Pattern](/previous-versions/msp-n-p/dn589782(v=pandp.10)) from the [Command Query Responsibility Segregation (CQRS)](/previous-versions/msp-n-p/jj554200(v=pandp.10)) pattern.  
 
 ## Intra-partition secondary index pattern
 
diff --git a/includes/functions-host-json-event-hubs.md b/includes/functions-host-json-event-hubs.md
