Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

articles/active-directory/manage-apps/user-provisioning.md

@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
 ---
 # Automate user provisioning and deprovisioning to SaaS applications with Azure Active Directory
 
-Azure Active Directory (Azure AD) lets you automate the creation, maintenance, and removal of user identities in cloud ([SaaS](https://azure.microsoft.com/overview/what-is-saas/)) applications such as Dropbox, Salesforce, ServiceNow, and more. This is known as automated user provisioning for SaaS apps.
+Azure Active Directory (Azure AD) lets you automate the creation, maintenance, and removal of user identities in cloud SaaS applications such as [Dropbox](https://docs.microsoft.com/azure/active-directory/saas-apps/dropboxforbusiness-provisioning-tutorial), [Salesforce](https://docs.microsoft.com/azure/active-directory/saas-apps/salesforce-provisioning-tutorial), [ServiceNow](https://docs.microsoft.com/azure/active-directory/saas-apps/servicenow-provisioning-tutorial), and more. This is known as automated user provisioning for SaaS apps.
 
 > [!VIDEO https://www.youtube.com/embed/_ZjARPpI6NI]
 
@@ -85,11 +85,7 @@ Use the Azure Active Directory portal to configure the Azure AD provisioning ser
 
 1. Open the **[Azure Active Directory portal](https://aad.portal.azure.com)**.
 1. Select **Enterprise applications** from the left pane. A list of all configured apps is show.
-1. Choose **+ New application** to add an application. Add either of the following depending on your scenario:
-
-   - The **Add your own app** option supports custom-developed SCIM integrations.
-   - All applications in the **Add from the gallery** > **Featured applications** section support automatic provisioning. See the [list of application tutorials for user provisioning](../saas-apps/tutorial-list.md) for additional ones.
-
+1. Choose **+ New application** to add an application. 
 1. Provide any details and select **Add**. The new app is added to the list of enterprise applications and opens to its application management screen.
 1. Select **Provisioning** to manage user account provisioning settings for the app.
 

articles/active-directory/reports-monitoring/concept-provisioning-logs.md

@@ -204,7 +204,9 @@ The **summary** tab provides an overview of what happened and identifiers for th
 
 ## Error Codes
 
-|ErrorCode|Description|
+Use the table below to better understand how to resolve errors you may find in the provisioning logs. For any error codes that are missing, provide feedback using the link at the bottom of this page. 
+
+|Error Code|Description|
 |---|---|
 |Conflict, EntryConflict|Correct the conflicting attribute values in either Azure AD or the application, or review your matching attribute configuration if the conflicting user account was supposed to be matched and taken over. Review the following [documentation](https://docs.microsoft.com/azure/active-directory/manage-apps/customize-application-attributes) for more information on configuring matching attributes.|
 |TooManyRequests|The target app rejected this attempt to update the user because it is overloaded and receiving too many requests. There is nothing to do. This attempt will automatically be retired. Microsoft has also been notified of this issue.|

articles/active-directory/saas-apps/tutorial-list.md

@@ -26,6 +26,8 @@ To help integrate your cloud-enabled [software as a service (SaaS)](https://azur
 
 For a list of all SaaS apps that have been pre-integrated into Azure AD, see the [Active Directory Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/category/azure-active-directory-apps).
 
+Use the [application network portal](https://docs.microsoft.com/azure/active-directory/develop/howto-app-gallery-listing) to request a [SCIM](https://docs.microsoft.com/azure/active-directory/manage-apps/use-scim-to-provision-users-and-groups) enabled application to be added to the gallery for automatic provisioning or a SAML / OIDC enabled application to be added to the gallery for SSO.
+
 ## Quick links
 
 | Logo | Application tutorial for single sign-on | Application tutorial for user provisioning |
@@ -112,4 +114,4 @@ To find more tutorials, use the table of contents on the left.
 
 ## Next steps
 
-To learn more about application management, see [What is application management](../manage-apps/what-is-application-management.md).
+To learn more about application management, see [What is application management](../manage-apps/what-is-application-management.md).

articles/azure-functions/functions-bindings-service-bus.md

@@ -28,7 +28,7 @@ The Service Bus bindings are provided in the [Microsoft.Azure.WebJobs.ServiceBus
 
 ## Packages - Functions 2.x
 
-The Service Bus bindings are provided in the [Microsoft.Azure.WebJobs.Extensions.ServiceBus](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.ServiceBus) NuGet package, version 3.x. Source code for the package is in the [azure-webjobs-sdk](https://github.com/Azure/azure-webjobs-sdk/blob/master/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus/) GitHub repository.
+The Service Bus bindings are provided in the [Microsoft.Azure.WebJobs.Extensions.ServiceBus](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.ServiceBus) NuGet package, version 3.x. Source code for the package is in the [azure-functions-servicebus-extension](https://github.com/Azure/azure-functions-servicebus-extension) GitHub repository.
 
 > [!NOTE]
 > Version 2.x does not create the topic or subscription configured in the `ServiceBusTrigger` instance. Version 2.x is based on [Microsoft.Azure.ServiceBus](https://www.nuget.org/packages/Microsoft.Azure.ServiceBus) and does not handle queue management.

articles/azure-monitor/log-query/examples.md

@@ -171,7 +171,6 @@ let EndTime = now()-4d;
 Perf
 | where CounterName == "% Processor Time"  
 | where TimeGenerated > StartTime and TimeGenerated < EndTime
-and TimeGenerated < EndTime
 | project TimeGenerated, Computer, cpu=CounterValue 
 | join kind= inner (
    Perf

articles/backup/backup-azure-arm-userestapi-createorupdatepolicy.md

@@ -13,7 +13,7 @@ ms.assetid: 5ffc4115-0ae5-4b85-a18c-8a942f6d4870
 ---
 # Create Azure Recovery Services backup policies using REST API
 
-The steps to create a backup policy for an Azure Recovery Services vault are outlined in the [policy REST API document](https://docs.microsoft.com/rest/api/backup/protectionpolicies/createorupdate). Let us use this document as a reference to create a policy for Azure VM backup.
+The steps to create a backup policy for an Azure Recovery Services vault are outlined in the [policy REST API document](https://docs.microsoft.com/rest/api/backup/protectionpolicies(2019-05-13)/createorupdate). Let us use this document as a reference to create a policy for Azure VM backup.
 
 ## Backup policy essentials
 
@@ -46,10 +46,10 @@ For example, to create a policy for Azure VM backup, following are the component
 
 |Name  |Required  |Type  |Description  |
 |---------|---------|---------|---------|
-|properties     |   True      |  ProtectionPolicy:[AzureIaaSVMProtectionPolicy](https://docs.microsoft.com/rest/api/backup/protectionpolicies/createorupdate#azureiaasvmprotectionpolicy)      | ProtectionPolicyResource properties        |
+|properties     |   True      |  ProtectionPolicy:[AzureIaaSVMProtectionPolicy](https://docs.microsoft.com/rest/api/backup/protectionpolicies(2019-05-13)/createorupdate#azureiaasvmprotectionpolicy)      | ProtectionPolicyResource properties        |
 |tags     |         | Object        |  Resource tags       |
 
-For the complete list of definitions in the request body, refer to the [backup policy REST API document](https://docs.microsoft.com/rest/api/backup/protectionpolicies/createorupdate).
+For the complete list of definitions in the request body, refer to the [backup policy REST API document](https://docs.microsoft.com/rest/api/backup/protectionpolicies(2019-05-13)/createorupdate).
 
 ### Example request body
 
@@ -150,11 +150,11 @@ The policy says:
 
 The backup policy creation/update is a [asynchronous operation](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-async-operations). It means this operation creates another operation that needs to be tracked separately.
 
-It returns two responses: 202 (Accepted) when another operation is created and then 200 (OK) when that operation completes.
+It returns two responses: 202 (Accepted) when another operation is created, and then 200 (OK) when that operation completes.
 
 |Name  |Type  |Description  |
 |---------|---------|---------|
-|200 OK     |    [Protection PolicyResource](https://docs.microsoft.com/rest/api/backup/protectionpolicies/createorupdate#protectionpolicyresource)     |  OK       |
+|200 OK     |    [Protection PolicyResource](https://docs.microsoft.com/rest/api/backup/protectionpolicies(2019-05-13)/createorupdate#protectionpolicyresource)     |  OK       |
 |202 Accepted     |         |     Accepted    |
 
 ### Example responses
@@ -279,7 +279,7 @@ If a policy is already being used to protect an item, any update in the policy w
 
 [Enable protection for an unprotected Azure VM](backup-azure-arm-userestapi-backupazurevms.md).
 
-For more information on the Azure Backup REST APIs, refer to the following documents:
+For more information on the Azure Backup REST APIs, see the following documents:
 
 - [Azure Recovery Services provider REST API](/rest/api/recoveryservices/)
-- [Get started with Azure REST API](/rest/api/azure/)
+- [Get started with Azure REST API](/rest/api/azure/)

articles/backup/backup-sql-server-azure-troubleshoot.md

@@ -28,7 +28,6 @@ To configure protection for a SQL Server database on a virtual machine, you must
 |---|---|---|---|
 | Warning | Current settings for this database don't support certain backup types present in the associated policy. | <li>Only a full database backup operation can be performed on the master database. Neither differential backup nor transaction log backup is possible. </li> <li>Any database in the simple recovery model does not allow for the backup of transaction logs.</li> | Modify the database settings such that all the backup types in the policy are supported. Or, change the current policy to include only the supported backup types. Otherwise, the unsupported backup types will be skipped during scheduled backup or the backup job will fail for ad hoc backup.
 
-
 ### UserErrorSQLPODoesNotSupportBackupType
 
 | Error message | Possible causes | Recommended action |
@@ -78,7 +77,7 @@ To configure protection for a SQL Server database on a virtual machine, you must
 |---|---|---|
 | Restore failed as the database could not be brought offline. | While you're doing a restore, the target database needs to be brought offline. Azure Backup can't bring this data offline. | Use the additional details on the Azure portal error menu to narrow down the root causes. For more information, see the [SQL Server documentation](https://docs.microsoft.com/sql/relational-databases/backup-restore/restore-a-database-backup-using-ssms). |
 
-###  UserErrorCannotFindServerCertificateWithThumbprint
+### UserErrorCannotFindServerCertificateWithThumbprint
 
 | Error message | Possible causes | Recommended action |
 |---|---|---|
@@ -90,7 +89,6 @@ To configure protection for a SQL Server database on a virtual machine, you must
 |---|---|---|
 | The log backup used for recovery contains bulk-logged changes. It cannot be used to stop at an arbitrary point in time as per the SQL guidelines. | When a database is in bulk-logged recovery mode, the data between a bulk-logged transaction and the next log transaction can't be recovered. | Choose a different point in time for recovery. [Learn more](https://docs.microsoft.com/previous-versions/sql/sql-server-2008-r2/ms186229(v=sql.105)).
 
-
 ### FabricSvcBackupPreferenceCheckFailedUserError
 
 | Error message | Possible causes | Recommended action |
@@ -125,8 +123,7 @@ Operation is blocked as you have reached the limit on number of operations permi
 
 | Error message | Possible causes | Recommended action |
 |---|---|---|
-Operation is blocked as the vault has reached its maximum limit for such operations permitted in a span of 24 hours. | When you have reached the maximum permissible limit for an operation in a span of 24 hours, this error comes. This error usually comes in case of at-scale operations such as modify policy or auto-protection. Unlike in the case of CloudDosAbsoluteLimitReached, there is not much you can do to resolve this state, in fact, Azure Backup service will retry the operations internally for all the items in question.<br> For example: If you have a large number of datasources protected with a policy and you try to modify that policy, it will trigger configure protection jobs for each of the protected items and sometimes may hit the maximum limit permissible for such operations per day.| Azure Backup service will automatically retry this operation after 24 hours. 
-
+Operation is blocked as the vault has reached its maximum limit for such operations permitted in a span of 24 hours. | When you have reached the maximum permissible limit for an operation in a span of 24 hours, this error comes. This error usually comes when there are at-scale operations such as modify policy or auto-protection. Unlike in the case of CloudDosAbsoluteLimitReached, there is not much you can do to resolve this state, in fact, Azure Backup service will retry the operations internally for all the items in question.<br> For example: If you have a large number of datasources protected with a policy and you try to modify that policy, it will trigger configure protection jobs for each of the protected items and sometimes may hit the maximum limit permissible for such operations per day.| Azure Backup service will automatically retry this operation after 24 hours.
 
 ## Re-registration failures
 
@@ -145,14 +142,14 @@ Check for one or more of the following symptoms before you trigger the re-regist
 
 These symptoms may arise for one or more of the following reasons:
 
-* An extension was deleted or uninstalled from the portal. 
+* An extension was deleted or uninstalled from the portal.
 * An extension was uninstalled from **Control Panel** on the VM under **Uninstall or Change a Program**.
 * The VM was restored back in time through in-place disk restore.
 * The VM was shut down for an extended period, so the extension configuration on it expired.
 * The VM was deleted, and another VM was created with the same name and in the same resource group as the deleted VM.
 * One of the availability group nodes didn't receive the complete backup configuration. This can happen when the availability group is registered to the vault or when a new node is added.
 
-In the preceding scenarios, we recommend that you trigger a re-register operation on the VM. For now, this option is available only through PowerShell.
+In the preceding scenarios, we recommend that you trigger a re-register operation on the VM. See [here](https://docs.microsoft.com/azure/backup/backup-azure-sql-automation#enable-backup) for instructions on how to perform this task in PowerShell.
 
 ## Size limit for files
 
@@ -183,6 +180,7 @@ If the string size of the content exceeds 20,000 bytes, the database files are s
 You can override the target restore file path during the restore operation by placing a JSON file that contains the mapping of the database file to the target restore path. Create a `database_name.json` file and place it in the location *C:\Program Files\Azure Workload Backup\bin\plugins\SQL*.
 
 The content of the file should be in this format:
+
 ```json
 [
   {
@@ -223,7 +221,6 @@ SELECT mf.name AS LogicalName FROM sys.master_files mf
                 WHERE db.name = N'<Database Name>'"
   ```
 
-
 This file should be placed before you trigger the restore operation.
 
 ## Next steps