Merge pull request #234433 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 5531c5ec0c4a · 2023-04-14T06:01:10.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/active-directory/app-provisioning/how-provisioning-works.md b/articles/active-directory/app-provisioning/how-provisioning-works.md
@@ -88,7 +88,7 @@ originalUserPrincipalName = alias_theirdomain#EXT#@yourdomain
 
 ## Provisioning cycles: Initial and incremental
 
-When Azure AD is the source system, the provisioning service uses the [Use delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) to monitor users and groups. The provisioning service runs an initial cycle against the source system and target system, followed by periodic incremental cycles.
+When Azure AD is the source system, the provisioning service uses the [delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) to monitor users and groups. The provisioning service runs an initial cycle against the source system and target system, followed by periodic incremental cycles.
 
 ### Initial cycle
 
diff --git a/articles/active-directory/authentication/howto-sspr-deployment.md b/articles/active-directory/authentication/howto-sspr-deployment.md
@@ -38,6 +38,9 @@ To quickly see SSPR in action and then come back to understand additional deploy
 > [!div class="nextstepaction"]
 > [Enable self-service password reset (SSPR)](tutorial-enable-sspr.md)
 
+> [!TIP]
+> As a companion to this article, we recommend using the [Plan your self-service password reset deployment guide](https://go.microsoft.com/fwlink/?linkid=2221501) when signed in to the Microsoft 365 Admin Center. This guide will customize your experience based on your environment. To review best practices without signing in and activating automated setup features, go to the [M365 Setup portal](https://go.microsoft.com/fwlink/?linkid=2221600). 
+
 ## Learn about SSPR
 
 Learn more about SSPR. See [How it works: Azure AD self-service password reset](./concept-sspr-howitworks.md).
diff --git a/articles/app-service/monitor-instances-health-check.md b/articles/app-service/monitor-instances-health-check.md
@@ -136,6 +136,11 @@ If you restart the instance and the restart process fails, you will then be give
 
 Windows applications will also have the option to view processes via the Process Explorer.  This gives you further insight on the instance's processes including thread count, private memory, and total CPU time.
 
+## Diagnostic information collection
+For Windows applications, you have the option to collect diagnostic information in the Health Check tab. Enabling diagnostic collection will add an auto-heal rule that creates memory dumps for unhealthy instances and saves it to a designated storage account. Enabling this option will change auto-heal configurations. If there are existing auto-heal rules, we recommend setting this up through App Service diagnostics. 
+
+Once diagnostic collection is enabled, you can create or choose an existing storage account for your files. You can only select storage accounts in the same region as your application. Keep in mind that saving will restart your application. After saving, if your site instances are found to be unhealthy after continuous pings, you can go to your storage account resource and view the memory dumps.
+
 
 ## Monitoring
 
diff --git a/articles/cosmos-db/how-to-setup-customer-managed-keys.md b/articles/cosmos-db/how-to-setup-customer-managed-keys.md
@@ -554,7 +554,7 @@ Use the Azure CLI to restore a continuous account that is already configured usi
         --resource-group $resourceGroupName \
         --account-name $sourceAccountName \
         --target-database-account-name $targetAccountName \
-        --locations regionName=$location \
+        --location $location \
         --restore-timestamp $timestamp \
         --assign-identity $identityId \
         --default-identity "UserAssignedIdentity=$identityId" \
diff --git a/articles/defender-for-cloud/includes/defender-for-containers-assign-workspace-aks.md b/articles/defender-for-cloud/includes/defender-for-containers-assign-workspace-aks.md
@@ -85,6 +85,6 @@ If the policy has already been assigned to a workspace, you'll see `Assignments
 
    :::image type="content" source="../media/defender-for-containers/drop-down-menu.png" alt-text="Screenshot showing where the dropdown menu is located." lightbox="../media/defender-for-containers/drop-down-menu.png"::: 
 
-1. Select **Review + create**.
+1. Select **Review + save**.
 
-1. Select **Create**.
+1. Select **Save**.
diff --git a/articles/defender-for-cloud/includes/defender-for-containers-assign-workspace-arc.md b/articles/defender-for-cloud/includes/defender-for-containers-assign-workspace-arc.md
@@ -85,6 +85,6 @@ If the policy has already been assigned to a workspace, you'll see `Assignments
 
    :::image type="content" source="../media/defender-for-containers/drop-down-menu-arc.png" alt-text="Screenshot showing where the dropdown menu is located for ARC." lightbox="../media/defender-for-containers/drop-down-menu-arc.png"::: 
 
-1. Select **Review + create**.
+1. Select **Review + save**.
 
-1. Select **Create**.
+1. Select **Save**.
diff --git a/articles/networking/nva-accelerated-connections.md b/articles/networking/nva-accelerated-connections.md
@@ -65,6 +65,8 @@ This list will be updated as more regions become available. The following region
 
 * North Central US
 * West Central US
+* East US
+* West US
 
 ## Supported SKUs
 
diff --git a/articles/static-web-apps/database-azure-cosmos-db.md b/articles/static-web-apps/database-azure-cosmos-db.md
@@ -177,9 +177,9 @@ Next, create the configuration file that your static web app uses to interface w
 
     The `init` command creates the *staticwebapp.database.config.json* file in the *swa-db-connections* folder.
 
-1. Paste in this sample schema into the *staticwebapp.schema.config.json* file you generated.
+1. Paste in this sample schema into the *staticwebapp.database.schema.gql* file you generated.
 
-    Since Cosmos DB for NoSQL is a schema agnostic database, Azure Static Web Apps database connections can't extract the schema of your database. The *staticwebapp.schema.config.json* file allows you to specify the schema of your Cosmos DB for NoSQL database for Static Web Apps.
+    Since Cosmos DB for NoSQL is a schema agnostic database, Azure Static Web Apps database connections can't extract the schema of your database. The *staticwebapp.database.schema.gql* file allows you to specify the schema of your Cosmos DB for NoSQL database for Static Web Apps.
 
     ```gql
     type Person @model {
diff --git a/articles/storage/blobs/blob-inventory.md b/articles/storage/blobs/blob-inventory.md
@@ -407,6 +407,8 @@ An inventory job can take a longer amount of time in these cases:
 
   An inventory job might take more than one day to complete for hierarchical namespace enabled accounts that have hundreds of millions of blobs. Sometimes the inventory job fails and doesn't create an inventory file. If a job doesn't complete successfully, check subsequent jobs to see if they're complete before contacting support.
 
+- There is no option to generate a report retrospectively for a particular date.
+
 #### Inventory jobs can't write reports to containers that have an object replication policy
 
 An object replication policy can prevent an inventory job from writing inventory reports to the destination container. Some other scenarios can archive the reports or make the reports immutable when they're partially completed which can cause inventory jobs to fail.
diff --git a/articles/storage/blobs/data-lake-storage-acl-powershell.md b/articles/storage/blobs/data-lake-storage-acl-powershell.md
@@ -185,7 +185,7 @@ $file.ACL
 ```
 
 > [!NOTE]
-> To a set the ACL of a specific group or user, use their respective object IDs. For example, to set the ACL of a **group**, use `group:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`. To set the ACL of a **user**, use `user:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`.
+> To set the ACL of a specific group or user, service principal, or managed identity, use their respective object IDs. For example, to set the ACL of a **group**, use `group:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`. To set the ACL of a **user**, use `user:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`.
 
 The following image shows the output after setting the ACL of a file.
 
@@ -262,7 +262,7 @@ Update-AzDataLakeGen2AclRecursive -Context $ctx -FileSystem $filesystemName -Pat
 ```
 
 > [!NOTE]
-> To a set the ACL of a specific group or user, use their respective object IDs. For example, `group:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` or `user:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`.
+> To set the ACL of a specific group or user, service principal, or managed identity, use their respective object IDs. For example, to set the ACL of a **group**, use `group:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`. To set the ACL of a **user**, use `user:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`.
 
 To see an example that updates ACLs recursively in batches by specifying a batch size, see the [Update-AzDataLakeGen2AclRecursive](/powershell/module/az.storage/update-azdatalakegen2aclrecursive) reference article.
 
diff --git a/articles/storage/blobs/secure-file-transfer-protocol-known-issues.md b/articles/storage/blobs/secure-file-transfer-protocol-known-issues.md
@@ -81,6 +81,8 @@ To learn more, see [SFTP permission model](secure-file-transfer-protocol-support
 
 - For performance issues and considerations, see [SSH File Transfer Protocol (SFTP) performance considerations in Azure Blob storage](secure-file-transfer-protocol-performance.md).
   
+-  By default, the Content-MD5 property of blobs that are uploaded by using SFTP are set to null. Therefore, if you want the Content-MD5 property of those blobs to contain an MD5 hash, your client must calculate that value, and then set the Content-MD5 property of the blob before the uploading the blob.
+  
 - Maximum file upload size via the SFTP endpoint is 100 GB. 
 
 - To change the storage account's redundancy/replication settings or initiate account failover, SFTP must be disabled. SFTP may be re-enabled once the conversion has completed. 
diff --git a/articles/storage/common/azure-defender-storage-configure.md b/articles/storage/common/azure-defender-storage-configure.md
@@ -312,7 +312,7 @@ Learn more about the [ARM template AzAPI reference](/azure/templates/microsoft.s
 
 #### Bicep template
 
-To enable and configure Microsoft Defender for Storage at the subscription level with per-transaction pricing using [Bicep](../../azure-resource-manager/bicep/overview.md), add the following to your Bicep template:
+To enable and configure Microsoft Defender for Storage at the storage account level using [Bicep](../../azure-resource-manager/bicep/overview.md), add the following to your Bicep template:
 
 ```bicep
 param accountName string
@@ -345,7 +345,7 @@ Learn more about the [Bicep template AzAPI reference](/azure/templates/microsoft
 
 ### REST API
 
-To enable and configure Microsoft Defender for Storage at the subscription level using REST API, create a PUT request with this endpoint. Replace the `subscriptionId` , `resourceGroupName`, and `accountName` in the endpoint URL with your own Azure subscription ID, resource group and storage account names accordingly.
+To enable and configure Microsoft Defender for Storage at the storage account level using REST API, create a PUT request with this endpoint. Replace the `subscriptionId` , `resourceGroupName`, and `accountName` in the endpoint URL with your own Azure subscription ID, resource group and storage account names accordingly.
 
 ```http
 PUT https://management.azure.com/subscriptions/{subscriptionId}/providers/Microsoft.Security/pricings/StorageAccounts?api-version=2023-01-01
diff --git a/articles/storage/files/storage-snapshots-files.md b/articles/storage/files/storage-snapshots-files.md
@@ -93,10 +93,26 @@ Before you deploy the share snapshot scheduler, carefully consider your share sn
 
 Share snapshots provide only file-level protection. Share snapshots don't prevent fat-finger deletions on a file share or storage account. To help protect a storage account from accidental deletions, you can either [enable soft delete](storage-files-prevent-file-share-deletion.md), or lock the storage account and/or the resource group.
 
+## Delete multiple snapshots
+
+Use the following PowerShell script to delete multiple file share snapshots. Be sure to replace **storageaccount_name**, **resource-GROUP**, and **sharename** with your own values.
+
+```powerShell
+$storageAccount = "storageaccount_name" 
+$RG = "resource-GROUP" $sharename = "sharename"
+$sa = get-azstorageaccount -Name $storageAccount -ResourceGroupName $RG $items = "","","" 
+ForEach ($item in $items)
+{
+    $snapshotTime = "$item"
+    $snap = Get-AzStorageShare -Name $sharename -SnapshotTime "$snapshotTime" -Context $sa.Context
+    $lease = [Azure.Storage.Files.Shares.Specialized.ShareLeaseClient]::new($snap.ShareClient)
+    $l
+}
+```
 ## Next steps
 - Working with share snapshots in:
     - [Azure file share backup](../../backup/azure-file-share-backup-overview.md)
     - [Azure PowerShell](/powershell/module/az.storage/new-azrmstorageshare)
     - [Azure CLI](/cli/azure/storage/share#az-storage-share-snapshot)
     - [Windows](storage-how-to-use-files-windows.md#accessing-share-snapshots-from-windows)
-    - [Share snapshot FAQ](storage-files-faq.md#share-snapshots)
+    - [Share snapshot FAQ](storage-files-faq.md#share-snapshots)
diff --git a/includes/static-web-apps-nextjs-unsupported.md b/includes/static-web-apps-nextjs-unsupported.md
@@ -14,7 +14,7 @@ During the preview, the following features of Static Web Apps are unsupported fo
 - Deployment via the SWA CLI.
 - Static Web Apps provided Authentication and Authorization.
   - Instead, you can use the Next.js [Authentication](https://nextjs.org/docs/authentication) feature.
-- The `staticwebapps.config.json` file.
+- The `staticwebapp.config.json` file.
   - Features such as custom headers and routing can be controlled using the `next.config.js` file.
 - `skip_app_build` and `skip_api_build` can't be used.
 - Incremental static regeneration (ISR) does not support caching images and [on-demand revalidation](https://nextjs.org/docs/basic-features/data-fetching/incremental-static-regeneration#using-on-demand-revalidation)
