Skip to content

Commit 1265ae9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into product-page-edit
2 parents 0343961 + b431040 commit 1265ae9

33 files changed

+224
-74
lines changed

articles/active-directory/app-provisioning/configure-automatic-user-provisioning-portal.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ ms.service: active-directory
88
ms.subservice: app-provisioning
99
ms.topic: how-to
1010
ms.workload: identity
11-
ms.date: 10/06/2022
11+
ms.date: 05/02/2023
1212
ms.author: kenwith
1313
ms.reviewer: arvinh
1414
---
1515

1616
# Managing user account provisioning for enterprise apps in the Azure portal
1717

18-
This article describes the general steps for managing automatic user account provisioning and de-provisioning for applications that support it. *User account provisioning* is the act of creating, updating, and/or disabling user account records in an application’s local user profile store. Most cloud and SaaS applications store the users role and permissions in the user's own local user profile store, and presence of such a user record in the user's local store is *required* for single sign-on and access to work. To learn more about automatic user account provisioning, see [Automate User Provisioning and Deprovisioning to SaaS Applications with Azure Active Directory](user-provisioning.md).
18+
This article describes the general steps for managing automatic user account provisioning and deprovisioning for applications that support it. *User account provisioning* is the act of creating, updating, and/or disabling user account records in an application’s local user profile store. Most cloud and SaaS applications store the role and permissions in the user's own local user profile store. The presence of such a user record in the user's local store is *required* for single sign-on and access to work. To learn more about automatic user account provisioning, see [Automate User Provisioning and Deprovisioning to SaaS Applications with Azure Active Directory](user-provisioning.md).
1919

2020
> [!IMPORTANT]
2121
> Azure Active Directory (Azure AD) has a gallery that contains thousands of pre-integrated applications that are enabled for automatic provisioning with Azure AD. You should start by finding the provisioning setup tutorial specific to your application in the [List of tutorials on how to integrate SaaS apps with Azure Active Directory](../saas-apps/tutorial-list.md). You'll likely find step-by-step guidance for configuring both the app and Azure AD to create the provisioning connection.
@@ -36,7 +36,7 @@ Use the Azure portal to view and manage all applications that are configured for
3636

3737
The **Provisioning** pane begins with a **Mode** menu, which shows the provisioning modes supported for an enterprise application, and lets you configure them. The available options include:
3838

39-
* **Automatic** - This option is shown if Azure AD supports automatic API-based provisioning or de-provisioning of user accounts to this application. Select this mode to display an interface that helps administrators:
39+
* **Automatic** - This option is shown if Azure AD supports automatic API-based provisioning or deprovisioning of user accounts to this application. Select this mode to display an interface that helps administrators:
4040

4141
* Configure Azure AD to connect to the application's user management API
4242
* Create account mappings and workflows that define how user account data should flow between Azure AD and the app
@@ -72,10 +72,10 @@ Supported customizations include:
7272

7373
### Settings
7474

75-
Expand **Settings** to set an email address to receive notifications and whether to receive alerts on errors. You can also select the scope of users to sync. You can choose to sync all users and groups or only those that are assigned.
75+
Expand **Settings** to set an email address to receive notifications and whether to receive alerts on errors. Also select the scope of users to sync. Choose to sync all users and groups or only users that are assigned.
7676

7777
### Provisioning Status
7878

79-
If provisioning is being enabled for the first time for an application, turn on the service by changing the **Provisioning Status** to **On**. This change causes the Azure AD provisioning service to run an initial cycle. It reads the users assigned in the **Users and groups** section, queries the target application for them, and then runs the provisioning actions defined in the Azure AD **Mappings** section. During this process, the provisioning service stores cached data about what user accounts it's managing, so non-managed accounts inside the target applications that were never in scope for assignment aren't affected by de-provisioning operations. After the initial cycle, the provisioning service automatically synchronizes user and group objects on a forty-minute interval.
79+
If provisioning is being enabled for the first time for an application, turn on the service by changing the **Provisioning Status** to **On**. This change causes the Azure AD provisioning service to run an initial cycle. It reads the users assigned in the **Users and groups** section, queries the target application for them, and then runs the provisioning actions defined in the Azure AD **Mappings** section. During this process, the provisioning service stores cached data about what user accounts it's managing. The service stores cached data so nonmanaged accounts inside the target applications that were never in scope for assignment aren't affected in deprovisioning operations. After the initial cycle, the provisioning service automatically synchronizes user and group objects on a forty-minute interval.
8080

8181
Change the **Provisioning Status** to **Off** to pause the provisioning service. In this state, Azure doesn't create, update, or remove any user or group objects in the app. Change the state back to **On** and the service picks up where it left off.

articles/active-directory/develop/msal-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MSAL Supports a wide range of application types and scenarios. Please refer to [
8282
ADAL to MSAL Migration Guide for different platforms are available in the following link.
8383
- [Migrate to MSAL iOS and MacOS](migrate-objc-adal-msal.md)
8484
- [Migrate to MSAL Java](migrate-adal-msal-java.md)
85-
- [Migrate to MSAL .Net](msal-net-migration.md)
85+
- [Migrate to MSAL .NET](msal-net-migration.md)
8686
- [Migrate to MSAL Node](msal-node-migration.md)
8787
- [Migrate to MSAL Python](migrate-python-adal-msal.md)
8888

articles/active-directory/develop/scenario-desktop-acquire-token-interactive.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ WithParentActivityOrWindow(IWin32Window window)
6060
// Mac
6161
WithParentActivityOrWindow(NSWindow window)
6262

63-
// .NET Standard (this will be on all platforms at runtime, but only on NetStandard at build time)
63+
// .NET Standard (this will be on all platforms at runtime, but only on .NET Standard platforms at build time)
6464
WithParentActivityOrWindow(object parent).
6565
```
6666

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ To read more about securing your Active Directory environment, see [Best practic
5858
#### Installation prerequisites
5959

6060
- Azure AD Connect must be installed on a domain-joined Windows Server 2016 or later. You can deploy Azure AD Connect on Windows Server 2016 but since Windows Server 2016 is in extended support, you may require [a paid support program](/lifecycle/policies/fixed#extended-support) if you require support for this configuration. We recommend the usage of domain joined Windows Server 2022.
61-
- The minimum .NET Framework version required is 4.6.2, and newer versions of .Net are also supported.
61+
- The minimum .NET Framework version required is 4.6.2, and newer versions of .NET are also supported.
6262
- Azure AD Connect can't be installed on Small Business Server or Windows Server Essentials before 2019 (Windows Server Essentials 2019 is supported). The server must be using Windows Server standard or better.
6363
- The Azure AD Connect server must have a full GUI installed. Installing Azure AD Connect on Windows Server Core isn't supported.
6464
- The Azure AD Connect server must not have PowerShell Transcription Group Policy enabled if you use the Azure AD Connect wizard to manage Active Directory Federation Services (AD FS) configuration. You can enable PowerShell transcription if you use the Azure AD Connect wizard to manage sync configuration.

articles/app-service/webjobs-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Run background tasks with WebJobs
33
description: Learn how to use WebJobs to run background tasks in Azure App Service. Choose from a variety of script formats and run them with CRON expressions.
44
author: ggailey777

articles/automation/troubleshoot/update-agent-issues.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,11 @@ For more information, see [Configure reboot settings](../update-management/con
228228

229229
### WSUS server configuration
230230

231-
If the environment is set to get updates from WSUS, ensure that it is approved in WSUS before the update deployment. For more information, see [WSUS configuration settings](../update-management/configure-wuagent.md#make-wsus-configuration-settings). If your environment is not using WSUS, ensure that you remove the WSUS server settings and [reset Windows update component](https://learn.microsoft.com/windows/deployment/update/windows-update-resources#how-do-i-reset-windows-update-components).
231+
If the environment is set to get updates from WSUS, ensure that it is approved in WSUS before the update deployment. For more information, see [WSUS configuration settings](../update-management/configure-wuagent.md#make-wsus-configuration-settings). If your environment is not using WSUS, ensure that you remove the WSUS server settings and [reset Windows update component](/windows/deployment/update/windows-update-resources#how-do-i-reset-windows-update-components).
232232

233233
### Automatically download and install
234234

235-
To fix the issue, disable the **AutoUpdate** feature. Set it to Disabled in the local group policy Configure Automatic Updates. For more information, see [Configure automatic updates](https://learn.microsoft.com/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates#configure-automatic-updates).
235+
To fix the issue, disable the **AutoUpdate** feature. Set it to Disabled in the local group policy Configure Automatic Updates. For more information, see [Configure automatic updates](/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates#configure-automatic-updates).
236236

237237

238238
## <a name="troubleshoot-offline"></a>Troubleshoot offline
@@ -256,7 +256,7 @@ CheckResultMessageArguments : {}
256256
257257
RuleId : DotNetFrameworkInstalledCheck
258258
RuleGroupId : prerequisites
259-
RuleName : .Net Framework 4.6.2+
259+
RuleName : .NET Framework 4.6.2+
260260
RuleGroupName : Prerequisite Checks
261261
RuleDescription : .NET Framework version 4.6.2 or higher is required
262262
CheckResult : Passed

articles/azure-maps/tutorial-prioritized-routes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ The next tutorial demonstrates the process of creating a simple store locator us
338338
[setCamera]: /javascript/api/azure-maps-control/atlas.map#setCamera_CameraOptions___CameraBoundsOptions___AnimationOptions_
339339
[MapControlCredential]: /javascript/api/azure-maps-rest/atlas.service.mapcontrolcredential
340340
[Azure Maps Route Directions API]: /javascript/api/azure-maps-rest/atlas.service.routeurl#calculateroutedirections-aborter--geojson-position----calculateroutedirectionsoptions-
341-
[Truck Route]: https://samples.azuremaps.com/?sample=car-vs-truck-route
341+
[Truck Route]: https://github.com/Azure-Samples/AzureMapsCodeSamples/tree/main/Samples/Tutorials/Truck%20Route
342342
[Multiple routes by mode of travel]: https://samples.azuremaps.com/?sample=multiple-routes-by-mode-of-travel
343-
[Data-driven style expressions]: data-driven-style-expressions-web-sdk.md
344343
[URI Parameters for Post Route Directions]: /rest/api/maps/route/postroutedirections#uri-parameters

articles/azure-monitor/app/application-insights-asp-net-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ PS C:\> Enable-ApplicationInsightsMonitoring -InstrumentationKeyMap
419419
```
420420

421421
> [!NOTE]
422-
> The naming of AppFilter in this context can be confusing, `AppFilter` sets the application name regex filter (HostingEnvironment.SiteName in the case of .Net on IIS). `VirtualPathFilter` sets the virtual path regex filter (HostingEnvironment.ApplicationVirtualPath in the case of .Net on IIS). To instrument a single app you would use the VirtualPathFilter as follows: `Enable-ApplicationInsightsMonitoring -InstrumentationKeyMap @(@{VirtualPathFilter="^/MyAppName$"; InstrumentationSettings=@{InstrumentationKey='<your ikey>'}})`
422+
> The naming of AppFilter in this context can be confusing, `AppFilter` sets the application name regex filter (HostingEnvironment.SiteName in the case of .NET on IIS). `VirtualPathFilter` sets the virtual path regex filter (HostingEnvironment.ApplicationVirtualPath in the case of .NET on IIS). To instrument a single app you would use the VirtualPathFilter as follows: `Enable-ApplicationInsightsMonitoring -InstrumentationKeyMap @(@{VirtualPathFilter="^/MyAppName$"; InstrumentationSettings=@{InstrumentationKey='<your ikey>'}})`
423423
424424
#### Parameters
425425

0 commit comments

Comments
 (0)