Skip to content

Commit f72ffe0

Browse files
authored
Merge branch 'MicrosoftDocs:main' into docs-editor/map-data-fields-to-entities-1689594566
2 parents e1821b2 + 8f7144e commit f72ffe0

File tree

35 files changed

+193
-142
lines changed

35 files changed

+193
-142
lines changed

articles/active-directory/develop/includes/libraries/libraries-spa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: henrymbugua
1010
| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------- | :----------------------------------------------------------------------------------: | :---------------------------------------------------: | :-------------------------------------------------------------: | :----------------------------------------------------------: |
1111
| Angular | [MSAL Angular v2](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)<sup>2</sup> | [msal-angular](https://www.npmjs.com/package/@azure/msal-angular) | [Tutorial](../../tutorial-v2-angular-auth-code.md) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA |
1212
| Angular | [MSAL Angular](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/msal-angular-v1/lib/msal-angular)<sup>3</sup> | [msal-angular](https://www.npmjs.com/package/@azure/msal-angular) || ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA |
13-
| AngularJS | [MSAL AngularJS](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/maintenance/msal-angularjs)<sup>3</sup> | [msal-angularjs](https://www.npmjs.com/package/@azure/msal-angular) || ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | Public preview |
13+
| AngularJS | [MSAL AngularJS](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular)<sup>3</sup> | [msal-angularjs](https://www.npmjs.com/package/@azure/msal-angular) || ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | Public preview |
1414
| JavaScript | [MSAL.js v2](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-browser)<sup>2</sup> | [msal-browser](https://www.npmjs.com/package/@azure/msal-browser) | [Tutorial](../../tutorial-v2-javascript-auth-code.md) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA |
1515
| JavaScript | [MSAL.js 1.0](/javascript/api/overview/msal-overview)<sup>3</sup> | [msal-core](https://www.npmjs.com/package/@azure/msal-core) || ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA |
1616
| React | [MSAL React](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-react)<sup>2</sup> | [msal-react](https://www.npmjs.com/package/@azure/msal-react) | [Tutorial](../../single-page-app-tutorial-01-register-app.md) | ![Library can request ID tokens for user sign-in.][y] | ![Library can request access tokens for protected web APIs.][y] | GA |

articles/active-directory/saas-apps/cleanmail-swiss-provisioning-tutorial.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: thwimmer
1616

1717
# Tutorial: Configure Cleanmail Swiss for automatic user provisioning
1818

19-
This tutorial describes the steps you need to do in both Cleanmail Swiss and Azure Active Directory (Azure AD) to configure automatic user provisioning. When configured, Azure AD automatically provisions and deprovisions users and groups to [Cleanmail](https://www.alinto.com/fr) using the Azure AD Provisioning service. For important details on what this service does, how it works, and frequently asked questions, see [Automate user provisioning and deprovisioning to SaaS applications with Azure Active Directory](../app-provisioning/user-provisioning.md).
19+
This tutorial describes the steps you need to do in both Cleanmail Swiss and Azure Active Directory (Azure AD) to configure automatic user provisioning. When configured, Azure AD automatically provisions and deprovisions users to [Cleanmail](https://www.alinto.com/fr) using the Azure AD Provisioning service. For important details on what this service does, how it works, and frequently asked questions, see [Automate user provisioning and deprovisioning to SaaS applications with Azure Active Directory](../app-provisioning/user-provisioning.md).
2020

2121

2222
## Capabilities supported
@@ -36,7 +36,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
3636

3737
## Step 1. Plan your provisioning deployment
3838
1. Learn about [how the provisioning service works](../app-provisioning/user-provisioning.md).
39-
1. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
39+
1. Determine who is in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
4040
1. Determine what data to [map between Azure AD and Cleanmail](../app-provisioning/customize-application-attributes.md).
4141

4242
## Step 2. Configure Cleanmail Swiss to support provisioning with Azure AD
@@ -47,18 +47,18 @@ Contact [Cleanmail Swiss Support](https://www.alinto.com/contact-email-provider/
4747

4848
Add Cleanmail Swiss from the Azure AD application gallery to start managing provisioning to Cleanmail. If you have previously setup Cleanmail Swiss for SSO, you can use the same application. However it's recommended you create a separate app when testing out the integration initially. Learn more about adding an application from the gallery [here](../manage-apps/add-application-portal.md).
4949

50-
## Step 4. Define who will be in scope for provisioning
50+
## Step 4. Define who is in scope for provisioning
5151

52-
The Azure AD provisioning service allows you to scope who will be provisioned based on assignment to the application and or based on attributes of the user and group. If you choose to scope who will be provisioned to your app based on assignment, you can use the following [steps](../manage-apps/assign-user-or-group-access-portal.md) to assign users and groups to the application. If you choose to scope who will be provisioned based solely on attributes of the user or group, you can use a scoping filter as described [here](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
52+
The Azure AD provisioning service allows you to scope who is provisioned based on assignment to the application and or based on attributes of the user. If you choose to scope who is provisioned to your app based on assignment, you can use the following [steps](../manage-apps/assign-user-or-group-access-portal.md) to assign users to the application. If you choose to scope who is provisioned based solely on attributes of the user, you can use a scoping filter as described [here](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
5353

54-
* Start small. Test with a small set of users and groups before rolling out to everyone. When scope for provisioning is set to assigned users and groups, you can control this by assigning one or two users or groups to the app. When scope is set to all users and groups, you can specify an [attribute based scoping filter](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
54+
* Start small. Test with a small set of users before rolling out to everyone. When the scope for provisioning is set to assigned users, you can control this by assigning one or two users to the app instance. When scope is set to all users, you can specify an [attribute based scoping filter](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
5555

5656
* If you need more roles, you can [update the application manifest](../develop/howto-add-app-roles-in-azure-ad-apps.md) to add new roles.
5757

5858

5959
## Step 5. Configure automatic user provisioning to Cleanmail Swiss
6060

61-
This section guides you through the steps to configure the Azure AD provisioning service to create, update, and disable users and groups in Cleanmail Swiss based on user and group assignments in Azure AD.
61+
This section guides you through the steps to configure the Azure AD provisioning service to create, update, and disable users in Cleanmail Swiss based on user assignments in Azure AD.
6262

6363
### To configure automatic user provisioning for Cleanmail Swiss in Azure AD:
6464

@@ -106,15 +106,15 @@ This section guides you through the steps to configure the Azure AD provisioning
106106

107107
![Screenshot of provisioning status toggled on.](common/provisioning-toggle-on.png)
108108

109-
1. Define the users and groups that you would like to provision to Cleanmail Swiss by choosing the desired values in **Scope** in the **Settings** section.
109+
1. Define the users that you would like to provision to Cleanmail Swiss by choosing the desired values in **Scope** in the **Settings** section.
110110

111111
![Screenshot of provisioning scope.](common/provisioning-scope.png)
112112

113113
1. When you're ready to provision, click **Save**.
114114

115115
![Screenshot of saving provisioning configuration.](common/provisioning-configuration-save.png)
116116

117-
This operation starts the initial synchronization cycle of all users and groups defined in **Scope** in the **Settings** section. The initial cycle takes longer to complete than next cycles, which occur approximately every 40 minutes as long as the Azure AD provisioning service is running.
117+
This operation starts the initial synchronization cycle of all users defined in **Scope** in the **Settings** section. The initial cycle takes longer to complete than next cycles, which occur approximately every 40 minutes as long as the Azure AD provisioning service is running.
118118

119119
## Step 6. Monitor your deployment
120120
Once you've configured provisioning, use the following resources to monitor your deployment:

articles/aks/load-balancer-standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ az aks create \
319319
By default, AKS sets *AllocatedOutboundPorts* on its load balancer to `0`, which enables [automatic outbound port assignment based on backend pool size][azure-lb-outbound-preallocatedports] when creating a cluster. For example, if a cluster has 50 or fewer nodes, 1024 ports are allocated to each node. As the number of nodes in the cluster increases, fewer ports are available per node.
320320

321321
> [!IMPORTANT]
322-
> There is a hard limit of 1024 ports regardless of whether front-end IPs are added when the node size is less than 50.
322+
> There is a hard limit of 1024 ports regardless of whether front-end IPs are added when the node size is less than or equal to 50 (1-50).
323323

324324
To show the *AllocatedOutboundPorts* value for the AKS cluster load balancer, use `az network lb outbound-rule list`.
325325

articles/app-service/environment/upgrade-to-asev3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Take the first steps toward upgrading to App Service Environment v3
44
ms.author: jordanselig
55
author: seligj95
66
ms.topic: overview
7-
ms.date: 06/26/2023
7+
ms.date: 07/17/2023
88
---
99

1010
# Upgrade to App Service Environment v3
@@ -23,7 +23,7 @@ This page is your one-stop shop for guidance and resources to help you upgrade s
2323
|**2**|**Migrate**|Based on results of your review, either upgrade using the migration feature or follow the manual steps.<br><br>- [Use the automated migration feature](how-to-migrate.md)<br>- [Migrate manually](migration-alternatives.md)|
2424
|**3**|**Testing and troubleshooting**|Upgrading using the automated migration feature requires a 3-6 hour service window. Support teams are monitoring upgrades to ensure success. If you have a support plan and you need technical help, create a [support request](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest).|
2525
|**4**|**Optimize your App Service plans**|Once your upgrade is complete, you can optimize the App Service plans for additional benefits.<br><br>Review the autoselected Isolated v2 SKU sizes and scale up or scale down your App Service plans as needed.<br><br>- [Scale down your App Service plans](../manage-scale-up.md)<br>- [App Service Environment post-migration scaling guidance](migrate.md#pricing)<br><br>Check out the pricing estimates if needed.<br><br>- [App Service pricing page](https://azure.microsoft.com/pricing/details/app-service/windows/)<br>- [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator)|
26-
|**5**|**Learn more**|Need more help? [Submit a request](https://cxp.azure.com/nominationportal/nominationform/fasttrack) to contact FastTrack.<br><br>[Frequently asked questions](migrate.md#frequently-asked-questions)<br><br>[Community support](https://aka.ms/asev1v2retirement)|
26+
|**5**|**Learn more**|Join the [free live webinar](https://developer.microsoft.com/en-us/reactor/events/20417) with FastTrack Architects.<br><br>Need more help? [Submit a request](https://cxp.azure.com/nominationportal/nominationform/fasttrack) to contact FastTrack.<br><br>[Frequently asked questions](migrate.md#frequently-asked-questions)<br><br>[Community support](https://aka.ms/asev1v2retirement)|
2727

2828
## Additional information
2929

articles/azure-resource-manager/management/preview-features.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ The portal only shows a preview feature when the service that owns the feature h
3030
1. Sign in to the [Azure portal](https://portal.azure.com/).
3131
1. In the search box, enter _subscriptions_ and select **Subscriptions**.
3232

33-
:::image type="content" source="./media/preview-features/search.png" alt-text="Azure portal search.":::
33+
:::image type="content" source="./media/preview-features/search.png" alt-text="Screenshot of Azure portal search box with 'subscriptions' entered.":::
3434

3535
1. Select the link for your subscription's name.
3636

37-
:::image type="content" source="./media/preview-features/subscriptions.png" alt-text="Select Azure subscription.":::
37+
:::image type="content" source="./media/preview-features/subscriptions.png" alt-text="Screenshot of Azure portal with subscription selection highlighted.":::
3838

3939
1. From the left menu, under **Settings** select **Preview features**.
4040

41-
:::image type="content" source="./media/preview-features/preview-features-menu.png" alt-text="Azure preview features menu.":::
41+
:::image type="content" source="./media/preview-features/preview-features-menu.png" alt-text="Screenshot of Azure portal with Preview features menu option highlighted.":::
4242

4343
1. You see a list of available preview features and your current registration status.
4444

45-
:::image type="content" source="./media/preview-features/preview-features-list.png" alt-text="Azure portal list of preview features.":::
45+
:::image type="content" source="./media/preview-features/preview-features-list.png" alt-text="Screenshot of Azure portal displaying a list of preview features.":::
4646

4747
1. From **Preview features** you can filter the list by **name**, **State**, or **Type**:
4848

4949
- **Filter by name**: Must contain text from a preview feature's name, not the **Display name**.
5050
- **State**: Select the drop-down menu and choose a state. The portal doesn't filter by **Unregistered**.
5151
- **Type**: Select the drop-down menu and choose a type.
5252

53-
:::image type="content" source="./media/preview-features/filter.png" alt-text="Azure portal filter preview features.":::
53+
:::image type="content" source="./media/preview-features/filter.png" alt-text="Screenshot of Azure portal with filter options for preview features.":::
5454

5555
# [Azure CLI](#tab/azure-cli)
5656

@@ -169,7 +169,7 @@ Some services require other methods, such as email, to get approval for pending
169169
1. Select the link for the preview feature you want to register.
170170
1. Select **Register**.
171171

172-
:::image type="content" source="./media/preview-features/register.png" alt-text="Azure portal register preview feature.":::
172+
:::image type="content" source="./media/preview-features/register.png" alt-text="Screenshot of Azure portal with Register button for a preview feature.":::
173173

174174
1. Select **OK**.
175175

@@ -253,7 +253,7 @@ You can unregister preview features from **Preview features**. The **State** cha
253253
1. Select the link for the preview feature you want to unregister.
254254
1. Select **Unregister**.
255255

256-
:::image type="content" source="./media/preview-features/unregister.png" alt-text="Azure portal unregister preview feature.":::
256+
:::image type="content" source="./media/preview-features/unregister.png" alt-text="Screenshot of Azure portal with Unregister button for a preview feature.":::
257257

258258
1. Select **OK**.
259259

articles/azure-resource-manager/management/request-limits-and-throttling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Throttling happens at two levels. Azure Resource Manager throttles requests for
1313

1414
The following image shows how throttling is applied as a request goes from the user to Azure Resource Manager and the resource provider. The image shows that requests are initially throttled per principal ID and per Azure Resource Manager instance in the region of the user sending the request. The requests are throttled per hour. When the request is forwarded to the resource provider, requests are throttled per region of the resource rather than per Azure Resource Manager instance in region of the user. The resource provider requests are also throttled per principal user ID and per hour.
1515

16-
![Request throttling](./media/request-limits-and-throttling/request-throttling.svg)
16+
:::image type="content" source="./media/request-limits-and-throttling/request-throttling.svg" alt-text="Diagram that shows how throttling is applied as a request goes from the user to Azure Resource Manager and the resource provider.":::
1717

1818
## Subscription and tenant limits
1919

0 commit comments

Comments
 (0)