Skip to content

Commit 3d1d28a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into erfreshness1
2 parents c489aaa + d82b562 commit 3d1d28a

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

articles/active-directory/enterprise-users/domains-admin-takeover.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: enterprise-users
1010
ms.topic: how-to
1111
ms.workload: identity
12-
ms.date: 06/23/2022
12+
ms.date: 08/31/2023
1313
ms.author: barclayn
1414
ms.reviewer: sumitp
1515
ms.custom: it-pro, seo-update-azuread-jan, has-azure-ad-ps-ref
@@ -114,6 +114,7 @@ The key and templates aren't moved over when the unmanaged organization is in a
114114
Although RMS for individuals is designed to support Azure AD authentication to open protected content, it doesn't prevent users from also protecting content. If users did protect content with the RMS for individuals subscription, and the key and templates weren't moved over, that content isn't accessible after the domain takeover.
115115

116116
### Azure AD PowerShell cmdlets for the ForceTakeover option
117+
117118
You can see these cmdlets used in [PowerShell example](#powershell-example).
118119

119120
cmdlet | Usage

articles/active-directory/enterprise-users/licensing-groups-assign.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Assign licenses to a group
3-
description: How to assign licenses to users by means of Azure Active Directory group licensing
3+
description: How to assign licenses to users with Azure Active Directory group licensing
44
services: active-directory
55
keywords: Azure AD licensing
66
documentationcenter: ''
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.subservice: enterprise-users
1212
ms.topic: how-to
1313
ms.workload: identity
14-
ms.date: 06/24/2022
14+
ms.date: 08/31/2023
1515
ms.author: barclayn
1616
ms.reviewer: sumitp
1717
ms.custom: it-pro

articles/active-directory/enterprise-users/licensing-groups-resolve-problems.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.subservice: enterprise-users
1212
ms.topic: how-to
1313
ms.workload: identity
14-
ms.date: 06/24/2022
14+
ms.date: 08/31/2023
1515
ms.author: barclayn
1616
ms.reviewer: sumitp
1717
ms.custom: it-pro
@@ -63,8 +63,8 @@ To see which users and groups are consuming licenses, select a product. Under **
6363
**Problem:** One of the products that's specified in the group contains a service plan that conflicts with another service plan that's already assigned to the user via a different product. Some service plans are configured in a way that they can't be assigned to the same user as another, related service plan.
6464

6565
> [!TIP]
66-
> Exchange Online Plan1 and Plan2 were previously non-duplicable service plans. However, now they are service plans that can be duplicated.
67-
> If you are experiencing conflicts with these service plans, please try reprocessing them.
66+
> Previously, Exchange Online Plan1 and Plan2 were unique and couldn't be duplicated. Now, both service plans have been updated to allow duplication.
67+
> If you are experiencing conflicts with these service plans, try reprocessing them.
6868
6969
The decision about how to resolve conflicting product licenses always belongs to the administrator. Azure AD doesn't automatically resolve license conflicts.
7070

@@ -114,7 +114,7 @@ Updating license assignment on a user causes the proxy address calculation to be
114114
## LicenseAssignmentAttributeConcurrencyException in audit logs
115115
116116
**Problem:** User has LicenseAssignmentAttributeConcurrencyException for license assignment in audit logs.
117-
When group-based licensing tries to process concurrent license assignment of same license to a user, this exception is recorded on the user. This usually happens when a user is a member of more than one group with same assigned license. Azure AD will retry processing the user license and will resolve the issue. There is no action required from the customer to fix this issue.
117+
When group-based licensing tries to process concurrent license assignment of same license to a user, this exception is recorded on the user. This usually happens when a user is a member of more than one group with same assigned license. Azure AD retries processing the user license until the issue is resolved. There is no action required from the customer to fix this issue.
118118
119119
## More than one product license assigned to a group
120120

articles/active-directory/enterprise-users/users-revoke-access.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ author: barclayn
1010
ms.author: barclayn
1111
manager: amycolannino
1212
ms.reviewer: krbain
13-
ms.date: 06/24/2022
13+
ms.date: 08/31/2023
1414
ms.custom: it-pro, has-azure-ad-ps-ref
1515
ms.collection: M365-identity-device-management
1616
---
@@ -99,6 +99,7 @@ As an administrator in Azure Active Directory, open PowerShell, run ``Connect-Az
9999
100100
>[!NOTE]
101101
> For information on specific roles that can perform these steps review [Azure AD built-in roles](../roles/permissions-reference.md)
102+
102103
## When access is revoked
103104
104105
Once admins have taken the above steps, the user can't gain new tokens for any application tied to Azure Active Directory. The elapsed time between revocation and the user losing their access depends on how the application is granting access:

articles/active-directory/managed-identities-azure-resources/how-to-view-managed-identity-service-principal-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.subservice: msi
1212
ms.topic: how-to
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
15-
ms.date: 06/24/2022
15+
ms.date: 08/31/2023
1616
ms.author: barclayn
1717
ms.collection: M365-identity-device-management
1818
---

articles/active-directory/managed-identities-azure-resources/qs-configure-portal-windows-vm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.subservice: msi
1111
ms.topic: quickstart
1212
ms.tgt_pltfrm: na
1313
ms.workload: identity
14-
ms.date: 01/11/2022
14+
ms.date: 08/31/2023
1515
ms.author: barclayn
1616
ms.collection: M365-identity-device-management
1717
ms.custom: mode-ui
@@ -107,7 +107,7 @@ To assign a user-assigned identity to a VM, your account needs the [Virtual Mach
107107
To remove a user-assigned identity from a VM, your account needs the [Virtual Machine Contributor](../../role-based-access-control/built-in-roles.md#virtual-machine-contributor) role assignment. No other Azure AD directory role assignments are required.
108108

109109
1. Sign in to the [Azure portal](https://portal.azure.com) using an account associated with the Azure subscription that contains the VM.
110-
2. Navigate to the desired VM and click **Identity**, **User assigned**, the name of the user-assigned managed identity you want to delete and then click **Remove** (click **Yes** in the confirmation pane).
110+
2. Navigate to the desired VM and select **Identity**, **User assigned**, the name of the user-assigned managed identity you want to delete and then click **Remove** (click **Yes** in the confirmation pane).
111111

112112
![Remove user-assigned managed identity from a VM](./media/msi-qs-configure-portal-windows-vm/remove-user-assigned-identity-vm-screenshot.png)
113113

articles/azure-monitor/app/distributed-tracing-telemetry-correlation.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ It's important to make sure the incoming and outgoing configurations are exactly
171171
172172
### Enable W3C distributed tracing support for web apps
173173
174-
This feature is in `Microsoft.ApplicationInsights.JavaScript`. It's disabled by default. To enable it, use `distributedTracingMode` config. AI_AND_W3C is provided for backward compatibility with any legacy services instrumented by Application Insights.
174+
This feature is enabled by default for Javascript and the headers are automatically included when the hosting page domain is the same as the domain the requests are sent to (for example, the hosting page is `example.com` and the Ajax requests are sent to `example.com`). To change the distributed tracing mode, use the [`distributedTracingMode` configuration field](./javascript-sdk-configuration.md#sdk-configuration). AI_AND_W3C is provided by default for backward compatibility with any legacy services instrumented by Application Insights.
175175
176176
- **[npm-based setup](./javascript-sdk.md?tabs=npmpackage#get-started)**
177177
@@ -186,6 +186,9 @@ This feature is in `Microsoft.ApplicationInsights.JavaScript`. It's disabled by
186186
```
187187
distributedTracingMode: 2 // DistributedTracingModes.W3C
188188
```
189+
190+
If the XMLHttpRequest or Fetch Ajax requests are sent to a different domain host, including sub-domains, the correlation headers are not included by default. To enable this feature, set the [`enableCorsCorrelation` configuration field](./javascript-sdk-configuration.md#sdk-configuration) to `true`. If you set `enableCorsCorrelation` to `true`, all XMLHttpRequest and Fetch Ajax requests include the correlation headers. As a result, if the application on the server that is being called doesn't support the `traceparent` header, the request may fail, depending on whether the browser / version can validate the request based on which headers the server will accept.
191+
189192
> [!IMPORTANT]
190193
> To see all configurations required to enable correlation, see the [JavaScript correlation documentation](./javascript.md#enable-distributed-tracing).
191194

0 commit comments

Comments
 (0)