Skip to content

Commit c7a2c5e

Browse files
committed
fixing merge conflicts
2 parents 86780a1 + 21eaaed commit c7a2c5e

File tree

312 files changed

+4070
-1761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+4070
-1761
lines changed

articles/active-directory/authentication/tutorial-enable-cloud-sync-sspr-writeback.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: active-directory
55
ms.service: active-directory
66
ms.subservice: authentication
77
ms.topic: tutorial
8-
ms.date: 09/08/2022
8+
ms.date: 09/27/2022
99
ms.author: justinha
1010
author: justinha
1111
ms.reviewer: tilarso
@@ -24,7 +24,7 @@ Azure Active Directory Connect cloud sync can synchronize Azure AD password chan
2424
- An account with:
2525
- [Global Administrator](../roles/permissions-reference.md#global-administrator) role
2626
- Azure AD configured for self-service password reset. If needed, complete this tutorial to enable Azure AD SSPR.
27-
- An on-premises AD DS environment configured with [Azure AD Connect cloud sync version 1.1.972.0 or later](../app-provisioning/provisioning-agent-release-version-history.md). Learn how to [identify the agent's current version](../cloud-sync/how-to-automatic-upgrade.md). If needed, configure Azure AD Connect cloud sync using [this tutorial](tutorial-enable-sspr.md).
27+
- An on-premises AD DS environment configured with [Azure AD Connect cloud sync version 1.1.977.0 or later](../app-provisioning/provisioning-agent-release-version-history.md). Learn how to [identify the agent's current version](../cloud-sync/how-to-automatic-upgrade.md). If needed, configure Azure AD Connect cloud sync using [this tutorial](tutorial-enable-sspr.md).
2828

2929

3030
## Deployment steps

articles/active-directory/cloud-infrastructure-entitlement-management/all-reports.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: View a list and description of all system reports available in Permissions Management reports
33
description: View a list and description of all system reports available in Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: overview
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# View a list and description of system reports

articles/active-directory/cloud-infrastructure-entitlement-management/faqs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Frequently asked questions (FAQs) about Permissions Management
33
description: Frequently asked questions (FAQs) about Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: faq
1010
ms.date: 04/20/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Frequently asked questions (FAQs)

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-add-remove-role-task.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Add and remove roles and tasks for groups, users, and service accounts for Microsoft Azure and Google Cloud Platform (GCP) identities in the Remediation dashboard in Permissions Management
33
description: How to attach and detach permissions for groups, users, and service accounts for Microsoft Azure and Google Cloud Platform (GCP) identities in the Remediation dashboard in Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Add and remove roles and tasks for Microsoft Azure and Google Cloud Platform (GCP) identities

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-attach-detach-permissions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Attach and detach permissions for users, roles, and groups for Amazon Web Services (AWS) identities in the Remediation dashboard in Permissions Management
33
description: How to attach and detach permissions for users, roles, and groups for Amazon Web Services (AWS) identities in the Remediation dashboard in Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Attach and detach policies for Amazon Web Services (AWS) identities

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-audit-trail-results.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Generate an on-demand report from a query in the Audit dashboard in Permissions Management
33
description: How to generate an on-demand report from a query in the **Audit** dashboard in Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Generate an on-demand report from a query

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-clone-role-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Clone a role/policy in the Remediation dashboard in Permissions Management
33
description: How to clone a role/policy in the Just Enough Permissions (JEP) Controller.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Clone a role/policy in the Remediation dashboard

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-create-alert-trigger.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Create and view activity alerts and alert triggers in Permissions Management
33
description: How to create and view activity alerts and alert triggers in Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Create and view activity alerts and alert triggers

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-create-approve-privilege-request.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Create or approve a request for permissions in the Remediation dashboard in Permissions Management
33
description: How to create or approve a request for permissions in the Remediation dashboard.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Create or approve a request for permissions

articles/active-directory/cloud-infrastructure-entitlement-management/how-to-create-custom-queries.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
title: Create a custom query in Permissions Management
33
description: How to create a custom query in the Audit dashboard in Permissions Management.
44
services: active-directory
5-
author: kenwith
6-
manager: rkarlin
5+
author: jenniferf-skc
6+
manager: amycolannino
77
ms.service: ciem
88
ms.workload: identity
99
ms.topic: how-to
1010
ms.date: 02/23/2022
11-
ms.author: kenwith
11+
ms.author: jfields
1212
---
1313

1414
# Create a custom query

0 commit comments

Comments
 (0)