Merge pull request #237291 from MicrosoftDocs/main

5/08 AM Publish

Author: huypub

articles/active-directory/app-provisioning/use-scim-to-build-users-and-groups-endpoints.md

@@ -75,7 +75,7 @@ Go to the [reference code](https://github.com/AzureAD/SCIMReferenceCode) from Gi
 
 1. If not installed, add [Azure App Service for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azureappservice) extension.
 
-1. To deploy the Microsoft.SCIM.WebHostSample app to Azure App Services, [create a new App Services](../../app-service/quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-vscode#publish-your-web-app).
+1. To deploy the Microsoft.SCIM.WebHostSample app to Azure App Services, [create a new App Services](../../app-service/quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-vscode#2-publish-your-web-app).
 
 1. In the Visual Studio Code terminal, run the .NET CLI command. This command generates a deployable publish folder for the app in the bin/debug/publish directory.
 
@@ -134,8 +134,6 @@ The default token validation code is configured to use an Azure AD token and req
 
 ## Next steps
 
-To develop a SCIM-compliant user and group endpoint with interoperability for a client, see [SCIM client implementation](http://www.simplecloud.info/#Implementations2).
-
 - [Tutorial: Validate a SCIM endpoint](scim-validator-tutorial.md)
 - [Tutorial: Develop and plan provisioning for a SCIM endpoint](use-scim-to-provision-users-and-groups.md)
 - [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)

articles/active-directory/authentication/how-to-mfa-number-match.md

@@ -56,7 +56,33 @@ In MSAL for Python, exceptions are rare because most errors are handled by retur
 
 [!INCLUDE [Active directory error handling claims challenges](../../../includes/active-directory-develop-error-handling-claims-challenges.md)]
 
-[!INCLUDE [Active directory error handling retries](../../../includes/active-directory-develop-error-handling-retries.md)]
+
+## Retrying after errors and exceptions
+
+MSAL makes HTTP calls to the Azure AD service, and occasionally failures can occur.
+For example the network can go down or the server is overloaded.
+
+MSAL Python 1.11+ automatically performs one retry attempt for you.
+You may customize this behavior by following
+[this instruction](https://msal-python.readthedocs.io/en/latest/#msal.ConfidentialClientApplication.params.http_client).
+
+### HTTP 429
+
+When the Service Token Server (STS) is overloaded with too many requests,
+it returns HTTP error 429 with a hint about how long until you can try again in the `Retry-After` response field.
+
+Your app was expected to throttle the subsequent requests, and only retry after the specified period.
+That was not an easy task.
+
+MSAL Python 1.16+ made it easy for you, in that your app could blindly retry in any given time
+(say, whenever the end user clicks the sign-in button again),
+MSAL Python 1.16+ would automatically throttle those retry attempts by returning same error response from an HTTP cache,
+and only sending out a real HTTP call when that call is attempted after the specified period.
+
+By default, this throttle mechanism works by saving throttle information into a built-in in-memory HTTP cache.
+You may provide your own `dict`-like object as the HTTP cache, which you can control how to persist its content.
+See [MSAL Python's API document](https://msal-python.readthedocs.io/en/latest/#msal.PublicClientApplication.params.http_cache)
+for more details.
 
 ## Next steps
 

articles/active-directory/develop/msal-error-handling-python.md

@@ -45,7 +45,22 @@ For details about the decision tree below, read [MSAL.NET or Microsoft.Identity.
 
 [See examples](https://identitydivision.visualstudio.com/DevEx/_wiki/wikis/DevEx.wiki/20413/1P-ADAL.NET-to-MSAL.NET-migration-examples) of other 1P teams who have already, or are currently, migrating from ADAL to one of the MSAL+ solutions above. See their code, and in some cases read about their migration story.
  -->
- 
+### Deprecated ADAL.Net Nuget packages and their MSAL.Net equivalents
+You might unknowingly consume ADAL dependencies from other Azure SDKs. Below are few of the deprecated packages and their MSAL alternatives.
+
+|  ADAL.NET Package (Deprecated) | MSAL.NET Package (Current) |
+| ----------- | ----------- |
+| `Microsoft.Azure.KeyVault`| `Azure.Security.KeyVault.Secrets, Azure.Security.KeyVault.Keys, Azure.Security.KeyVault.Certificates`|
+| `Microsoft.Azure.Management.Compute`| `Azure.ResourceManager.Compute`|
+| `Microsoft.Azure.Services.AppAuthentication`| `Azure.Identity`| 
+| `Microsoft.Azure.Management.StorageSync`| `Azure.ResourceManager.StorageSync`| 
+| `Microsoft.Azure.Management.Fluent`| `Azure.ResourceManager`| 
+| `Microsoft.Azure.Management.EventGrid`| `Azure.ResourceManager.EventGrid`| 
+| `Microsoft.Azure.Management.Automation`| `Azure.ResourceManager.Automation`| 
+| `Microsoft.Azure.Management.Compute.Fluent`| `Azure.ResourceManager.Compute`|
+| `Microsoft.Azure.Management.MachineLearning.Fluent`| `Azure.ResourceManager.MachineLearningCompute`|
+| `Microsoft.Azure.Management.Media, windowsazure.mediaservices`| `Azure.ResourceManager.Media`|
+
 ## Next steps
 
 - Learn about [public client and confidential client applications](msal-client-applications.md).