Merge pull request #214647 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/active-directory/fundamentals/auth-saml.md

@@ -43,7 +43,7 @@ While one of most important use cases that SAML addresses is SSO, especially by
 
 * **Web app**: Enterprise application that supports SAML and uses Azure AD as IdP.
 
-* **Token**: A SAML assertion (also known as SAML tokens) that carries sets of claims made by the IdP about the principle (user). It contains authentication information, attributes, and authorization decision statements.
+* **Token**: A SAML assertion (also known as SAML tokens) that carries sets of claims made by the IdP about the principal (user). It contains authentication information, attributes, and authorization decision statements.
 
 * **Azure AD**: Enterprise cloud IdP that provides SSO and Multi-factor authentication for SAML apps. It synchronizes, maintains, and manages identity information for users while providing authentication services to relying applications. 
 

articles/aks/egress-outboundtype.md

@@ -34,7 +34,7 @@ An AKS cluster can be customized with a unique `outboundType` of type `loadBalan
 > Outbound type impacts only the egress traffic of your cluster. For more information, see [setting up ingress controllers](ingress-basic.md).
 
 > [!NOTE]
-> You can use your own [route table][byo-route-table] with UDR and kubenet networking. Make sure you cluster identity (service principal or managed identity) has Contributor permissions to the custom route table.
+> You can use your own [route table][byo-route-table] with UDR and kubenet networking. Make sure your cluster identity (service principal or managed identity) has Contributor permissions to the custom route table.
 
 ### Outbound type of loadBalancer
 

articles/app-service/includes/quickstart-python/deploy-local-git.md

@@ -1,6 +1,6 @@
 ---
-author: DavidCBerry13
-ms.author: daberry
+author: cephalin
+ms.author: cephalin
 ms.topic: include
 ms.date: 01/29/2022
 ---
@@ -15,6 +15,20 @@ You can deploy your application code from a local Git repository to Azure by con
 | [!INCLUDE [Deploy local Git Azure portal 3](<./deploy-local-git-azure-portal-3.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-3-240px.png" alt-text="A screenshot showing the deployment center after saving and the remote Git URL to use for deployments." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-3.png"::: |
 | [!INCLUDE [Deploy local Git Azure portal 4](<./deploy-local-git-azure-portal-4.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-4-240px.png" alt-text="A screenshot showing the location of the deployment credentials in the deployment center in App Service." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-4.png"::: |
 
+Next, in the root directory of your application, configure a [Git remote](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) that points to Azure using the Git URL of the Azure remote obtained in a previous step.
+
+```bash
+git remote add azure <git-deployment-url>
+```
+
+You can now push code from your local Git repository to Azure using the Git remote you just configured. The default deployment branch for App Service is `master`, but many Git repositories are moving away from `master` to `main`. You can either specify the mapping from local branch name to remote branch name in the push (as shown below), or you can configure your [`DEPLOYMENT_BRANCH` app setting](/azure/app-service/deploy-local-git?tabs=cli#change-deployment-branch).
+
+```bash
+git push azure main:master
+```
+
+The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in the previous step. Git will then cache these credentials so you will not have to reenter them on subsequent deployments.
+
 ### [Azure CLI](#tab/deploy-instructions-azcli)
 
 First, configure the deployment source for your web app to be local Git using the `az webapp deployment source` command.  This command will output the URL of the remote Git repository that you will be pushing code to.  Make a copy of this value as you will need it in a later step.
@@ -31,7 +45,7 @@ Next, in the root directory of your application, configure a [Git remote](https:
 git remote add azure <git-deployment-url>
 ```
 
-You can now push code from your local Git repository to Azure using the Git remote you just configured. Master is the default deployment branch for App Service. You must specify the mapping from local branch name to remote branch name in the push.
+You can now push code from your local Git repository to Azure using the Git remote you just configured. The default deployment branch for App Service is `master`, but many Git repositories are moving away from `master` to `main`. You can either specify the mapping from local branch name to remote branch name in the push (as shown below), or you can configure your [`DEPLOYMENT_BRANCH` app setting](/azure/app-service/deploy-local-git?tabs=cli#change-deployment-branch).
 
 ```bash
 git push azure main:master

articles/cosmos-db/continuous-backup-restore-introduction.md

@@ -142,7 +142,7 @@ Currently the point in time restore functionality has the following limitations:
 
 * While a restore is in progress, don't modify or delete the Identity and Access Management (IAM) policies. These policies grant the permissions for the account to change any VNET, firewall configuration.
 
-* Azure Cosmso DB for SQL or MongoDB accounts that create unique index after the container is created aren't supported for continuous backup. Only containers that create unique index as a part of the initial container creation are supported. For MongoDB accounts, you create unique index using [extension commands](mongodb/custom-commands.md).
+* Azure Cosmos DB for SQL or MongoDB accounts that create unique index after the container is created aren't supported for continuous backup. Only containers that create unique index as a part of the initial container creation are supported. For MongoDB accounts, you create unique index using [extension commands](mongodb/custom-commands.md).
 
 * The point-in-time restore functionality always restores to a new Azure Cosmos DB account. Restoring to an existing account is currently not supported. If you're interested in providing feedback about in-place restore, contact the Azure Cosmos DB team via your account representative.
 

articles/event-grid/event-schema-blob-storage.md

@@ -651,7 +651,7 @@ If the blob storage account uses SFTP to create or overwrite a blob, then the da
 * The `identity` key is included in the data set. This corresponds to the local user used for SFTP authentication.
 
 > [!NOTE]
-> SFTP uploads will generate 2 events. One `SftpCreate` for an initial empty blob created when opening the file and one `SftpCommit` when the file contents are written.
+> SFTP uploads will generate 2 events. One `SftpCreate` for an initial empty blob created when opening the file and one `SftpCommit` when the file contents are written. If you want to ensure that the Microsoft.Storage.BlobCreated event is triggered only when a Block Blob is completely committed, filter the event for the SftpCommit REST API call.
 
 ```json
 [{

articles/marketplace/azure-private-plan-troubleshooting.md

@@ -65,6 +65,7 @@ While troubleshooting the Azure Subscription Hierarchy, keep these things in min
 
 - ISV to ensure the SaaS private plan is using the correct tenant ID for the customer - [How to find your Azure Active Directory tenant ID](../active-directory/fundamentals/active-directory-how-to-find-tenant.md). For VMs use the [Azure Subscription ID.](../azure-portal/get-subscription-tenant-id.md)
 - ISV to ensure that the Customer is not buying through a CSP. Private Plans are not available on a CSP-managed subscription.
+- ISV to ensure the purchaser tenant ID is always present in the private audience list and isn't removed until the customer SaaS subscription is unsubscribed as this could have potential consequences of managing or sending meter usage for that customer SaaS subscription.
 - Customer to ensure customer is logging in with an email ID that is registered under the same tenant ID (use the same user ID they used in step #1 above)
 - ISV to ask the customer to find the Private Plan in Azure Marketplace: [Private plans in Azure Marketplace](/marketplace/private-plans)
 - Customer to ensure marketplace is enabled - [Azure Marketplace](../cost-management-billing/manage/ea-azure-marketplace.md) – if it is not, the user has to contact their Azure Administrator to enable marketplace, for more information regarding Azure Marketplace, see [Azure Marketplace](../cost-management-billing/manage/ea-azure-marketplace.md).
@@ -81,4 +82,4 @@ While troubleshooting the Azure Subscription Hierarchy, keep these things in min
 
 ## Next steps
 
-- [Create an Azure Support Request](../azure-portal/supportability/how-to-create-azure-support-request.md)
+- [Create an Azure Support Request](../azure-portal/supportability/how-to-create-azure-support-request.md)

articles/marketplace/partner-center-portal/pc-saas-fulfillment-webhook.md

@@ -16,8 +16,8 @@ When creating a transactable SaaS offer in Partner Center, the partner provides
 * When the SaaS subscription is in *Subscribed* status:
     * ChangePlan
     * ChangeQuantity
-    * Renew
-    * Suspend
+    * Renew (notify only, no ACK needed)
+    * Suspend (notify only, no ACK needed)
     * Unsubscribe (notify only, no ACK needed)
 * When SaaS subscription is in *Suspended* status:
     * Reinstate

articles/notification-hubs/notification-hubs-android-push-notification-google-fcm-get-started.md

@@ -129,6 +129,7 @@ Your hub is now configured to work with Firebase Cloud Messaging. You also have
     ```gradle
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation 'com.google.firebase:firebase-iid:21.1.0'
     ```
 
 2. Add the following plug-in at the end of the file if it's not already there. 

articles/service-bus-messaging/service-bus-dead-letter-queues.md

@@ -73,5 +73,10 @@ You can access the dead-letter queue by using the following syntax:
 ```
 
 
+## Sending dead-lettered messages to be reprocessed
+As there can be valuable business data in messages that ended up in the dead-letter queue, it is desirable to have those messages be reprocessed when operators have finished dealing with the circumstances which caused the messages to be dead-lettered in the first place.
+
+Tools like [Azure Service Bus Explorer](/azure/service-bus-messaging/explorer) enable manual moving of messages between queues and topics. If there are many messages in the dead-letter queue that need to be moved, [code like this](https://stackoverflow.com/a/68632602/151350) can help move them all at once. Operators will often prefer having a user interface so they can troubleshoot which message types have failed processing, from which source queues, and for what reasons, while still being able to resubmit batches of messages to be reprocessed. Tools like [ServicePulse with NServiceBus](https://docs.particular.net/servicepulse/intro-failed-messages) provide these capabilities.
+
 ## Next steps
 See [Enable dead lettering for a queue or subscription](enable-dead-letter.md) to learn about different ways of configuring the **dead lettering on message expiration** setting.

articles/service-bus-messaging/service-bus-integrate-with-rabbitmq.md

@@ -102,7 +102,7 @@ In the `Address` field we'll enter the name of your **Azure Service Bus Queue**,
 
 ## Publishing Messages from RabbitMQ to Azure Service Bus
 
-In the RabbitMQ Management interface we can go to `Queues`, select the `azure` queue, and search for the `Publish message` panel. There a form will appear that will let you publish messages directly to your queue. For our example we're just going to add `fist message` as the `Payload` and hit `Publish Message`:
+In the RabbitMQ Management interface we can go to `Queues`, select the `azure` queue, and search for the `Publish message` panel. There a form will appear that will let you publish messages directly to your queue. For our example we're just going to add `first message` as the `Payload` and hit `Publish Message`:
 
 :::image type="content" source="./media/service-bus-integrate-with-rabbitmq/first-message.png" alt-text="Publish first message":::