Skip to content

Commit a3b9fc7

Browse files
committed
Merge branch 'master' into release-arc-resource-bridge
2 parents c4d68bf + b810699 commit a3b9fc7

File tree

15 files changed

+71
-68
lines changed

15 files changed

+71
-68
lines changed

articles/active-directory/fundamentals/active-directory-compare-azure-ad-to-ad.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.topic: conceptual
1010
ms.workload: identity
1111
ms.subservice: fundamentals
12-
ms.date: 02/26/2020
12+
ms.date: 12/23/2021
1313
ms.author: martinco
1414
---
1515

@@ -24,7 +24,7 @@ Most IT administrators are familiar with Active Directory Domain Services concep
2424
|Concept|Active Directory (AD)|Azure Active Directory |
2525
|:-|:-|:-|
2626
|**Users**|||
27-
|Provisioning: users | Organizations create internal users manually or use an in-house or automated provisioning system, such as the Microsoft Identity Manager, to integrate with an HR system.|Existing AD organizations use [Azure AD Connect](../hybrid/how-to-connect-sync-whatis.md) to sync identities to the cloud.</br> Azure AD adds support to automatically create users from [cloud HR systems](../saas-apps/workday-tutorial.md). </br>Azure AD can provision identities in [SCIM enabled](../app-provisioning/use-scim-to-provision-users-and-groups.md) SaaS apps to automatically provide apps with the necessary details to allow access for users. |
27+
|Provisioning: users | Organizations create internal users manually or use an in-house or automated provisioning system, such as the Microsoft Identity Manager, to integrate with an HR system.|Existing AD organizations use [Azure AD Connect](../hybrid/how-to-connect-sync-whatis.md) to sync identities to the cloud.</br> Azure AD adds support to automatically create users from [cloud HR systems](../app-provisioning/what-is-hr-driven-provisioning.md). </br>Azure AD can provision identities in [SCIM enabled](../app-provisioning/use-scim-to-provision-users-and-groups.md) SaaS apps to automatically provide apps with the necessary details to allow access for users. |
2828
|Provisioning: external identities| Organizations create external users manually as regular users in a dedicated external AD forest, resulting in administration overhead to manage the lifecycle of external identities (guest users)| Azure AD provides a special class of identity to support external identities. [Azure AD B2B](/azure/active-directory/b2b/) will manage the link to the external user identity to make sure they are valid. |
2929
| Entitlement management and groups| Administrators make users members of groups. App and resource owners then give groups access to apps or resources.| [Groups](./active-directory-groups-create-azure-portal.md) are also available in Azure AD and administrators can also use groups to grant permissions to resources. In Azure AD, administrators can assign membership to groups manually or use a query to dynamically include users to a group. </br> Administrators can use [Entitlement management](../governance/entitlement-management-overview.md) in Azure AD to give users access to a collection of apps and resources using workflows and, if necessary, time-based criteria. |
3030
| Admin management|Organizations will use a combination of domains, organizational units, and groups in AD to delegate administrative rights to manage the directory and resources it controls.| Azure AD provides [built-in roles](./active-directory-users-assign-role-azure-portal.md) with its Azure AD role-based access control (Azure AD RBAC) system, with limited support for [creating custom roles](../roles/custom-overview.md) to delegate privileged access to the identity system, the apps, and resources it controls.</br>Managing roles can be enhanced with [Privileged Identity Management (PIM)](../privileged-identity-management/pim-configure.md) to provide just-in-time, time-restricted, or workflow-based access to privileged roles. |
@@ -46,4 +46,4 @@ Most IT administrators are familiar with Active Directory Domain Services concep
4646
- [What is Azure Active Directory?](./active-directory-whatis.md)
4747
- [Compare self-managed Active Directory Domain Services, Azure Active Directory, and managed Azure Active Directory Domain Services](../../active-directory-domain-services/compare-identity-solutions.md)
4848
- [Frequently asked questions about Azure Active Directory](./active-directory-faq.yml)
49-
- [What's new in Azure Active Directory?](./whats-new.md)
49+
- [What's new in Azure Active Directory?](./whats-new.md)

articles/active-directory/governance/entitlement-management-request-access.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: how-to
1414
ms.subservice: compliance
15-
ms.date: 08/31/2021
15+
ms.date: 12/23/2021
1616
ms.author: ajburnle
1717
ms.reviewer: mamkumar
1818
ms.collection: M365-identity-device-management
@@ -49,15 +49,13 @@ Once you have found the access package in the My Access portal, you can submit a
4949

5050
**Prerequisite role:** Requestor
5151

52-
1. Find the access package in the list. If necessary, you can search by typing a search string and then selecting the **Name**, **Catalog**, or **Resources** filter.
53-
54-
![My Access portal - Resource search](./media/entitlement-management-request-access/my-access-resource-search.png)
55-
56-
1. Click the checkmark to select the access package.
52+
1. Find the access package in the list. If necessary, you can search by typing a search string and then selecting the **Name** or **Resources** filter.
53+
54+
1. To request access you can either:
5755

58-
1. Click **Request access** to open the Request access pane.
56+
1. Click the row to see Access package details, and then select Request access.
5957

60-
![My Access portal - Access packages](./media/entitlement-management-request-access/my-access-request-access-button.png)
58+
1. Or click **Request access** directly.
6159

6260
1. If the **Business justification** box is displayed, type a justification for needing access.
6361

articles/active-directory/governance/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ summary: Azure Active Directory (Azure AD) Identity Governance helps you to prot
66
metadata:
77
author: ajburnle
88
description: "Learn how to protect, monitor, and audit access to critical assets while ensuring employee productivity."
9-
manager: daveba
9+
manager: karenhoran
1010
ms.author: ajburnle
1111
ms.collection: na
1212
ms.date: 09/14/2019

articles/active-directory/governance/what-is-identity-lifecycle-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'What is identity lifecycle management with Azure Active Directory? | Mic
33
description: Describes overview of identity lifecycle management.
44
services: active-directory
55
author: billmath
6-
manager: daveba
6+
manager: karenhoran
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview

articles/active-directory/governance/what-is-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'What is provisioning with Azure Active Directory? | Microsoft Docs'
33
description: Describes overview of identity provisioning and the ILM scenarios.
44
services: active-directory
55
author: billmath
6-
manager: daveba
6+
manager: karenhoran
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
59.4 KB
Loading

articles/azure-maps/quick-demo-map-app.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
title: 'Quickstart: Interactive map search with Azure Maps'
3+
titeSuffix: Microsoft Azure Maps
34
description: 'Quickstart: Learn how to create interactive, searchable maps. See how to create an Azure Maps account, get a primary key, and use the Web SDK to set up map applications'
45
author: stevemunk
56
ms.author: v-munksteve
6-
ms.date: 09/30/2021
7+
ms.date: 12/23/2021
78
ms.topic: quickstart
89
ms.service: azure-maps
910
services: azure-maps
@@ -32,30 +33,29 @@ This quickstart uses the Azure Maps Web SDK, however the Azure Maps service can
3233

3334
Create a new Azure Maps account with the following steps:
3435

35-
1. In the upper left-hand corner of the [Azure portal](https://portal.azure.com), click **Create a resource**.
36-
2. In the *Search the Marketplace* box, type **Azure Maps**.
37-
3. From the *Results*, select **Azure Maps**. Click **Create** button that appears below the map.
38-
4. On the **Create Maps Account** page, enter the following values:
36+
1. Select **Create a resource** in the upper left-hand corner of the [Azure portal](https://portal.azure.com).
37+
2. Type **Azure Maps** in the *Search services and Marketplace* box.
38+
3. Select **Azure Maps** in the drop down list that appears, then select the **Create** button.
39+
4. On the **Create an Azure Maps Account resource** page, enter the following values then select the **Create** button:
3940
* The *Subscription* that you want to use for this account.
40-
* The *Resource group* name for this account. You may choose to *Create new* or *Use existing* resource group.
41-
* The *Name* of your new account.
42-
* The *Pricing tier* for this account.
43-
* Read the *License* and *Privacy Statement*, and check the checkbox to accept the terms.
44-
* Click the **Create** button.
41+
* The *Resource group* name for this account. You may choose to *Create new* or *Select existing* resource group.
42+
* The *Name* of your new Azure Maps account.
43+
* The *Pricing tier* for this account. Select **Gen2**.
44+
* Read the *License* and *Privacy Statement*, then select the checkbox to accept the terms.
4545

46-
:::image type="content" source="./media/quick-demo-map-app/create-account.png" alt-text="Create Maps account in portal" lightbox="./media/quick-demo-map-app/create-account.png":::
46+
:::image type="content" source="./media/quick-demo-map-app/create-account.png" alt-text="A screen shot showing the Create an Azure Maps Account resource page in the Azure portal." lightbox="./media/quick-demo-map-app/create-account.png":::
4747

4848
<a id="getkey"></a>
4949

5050
## Get the primary key for your account
5151

52-
Once your Maps account is successfully created, retrieve the primary key that enables you to query the Maps APIs.
52+
Once your Azure Maps account is successfully created, retrieve the primary key that enables you to query the Maps APIs.
5353

5454
1. Open your Maps account in the portal.
5555
2. In the settings section, select **Authentication**.
56-
3. Copy the **Primary Key** to your clipboard. Save it locally to use later in this tutorial.
56+
3. Copy the **Primary Key** and save it locally to use later in this tutorial.
5757

58-
:::image type="content" source="./media/quick-demo-map-app/get-key.png" alt-text="Get Primary Key Azure Maps key in Azure portal" lightbox="./media/quick-demo-map-app/get-key.png":::
58+
:::image type="content" source="./media/quick-demo-map-app/get-key.png" alt-text="Screen shot showing your Azure Maps Primary Key in the Azure portal" lightbox="./media/quick-demo-map-app/get-key.png":::
5959

6060
>[!NOTE]
6161
> This quickstart uses the [Shared Key](azure-maps-authentication.md#shared-key-authentication) authentication approach for demonstration purposes, but the preferred approach for any production environment is to use [Azure Active Directory](azure-maps-authentication.md#azure-ad-authentication) authentication.
@@ -77,7 +77,7 @@ Once your Maps account is successfully created, retrieve the primary key that en
7777
4. Try out the interactive search experience. In the search box on the upper-left corner of the demo web application, search for **restaurants**.
7878
5. Move your mouse over the list of addresses and locations that appear below the search box. Notice how the corresponding pin on the map pops out information about that location. For privacy of private businesses, fictitious names and addresses are shown.
7979

80-
:::image type="content" source="./media/quick-demo-map-app/interactive-search.png" alt-text="Interactive map search web application" lightbox="./media/quick-demo-map-app/interactive-search.png":::
80+
:::image type="content" source="./media/quick-demo-map-app/interactive-search.png" alt-text="A screen shot showing the interactive map search web application." lightbox="./media/quick-demo-map-app/interactive-search.png":::
8181

8282
## Clean up resources
8383

@@ -87,17 +87,17 @@ Once your Maps account is successfully created, retrieve the primary key that en
8787
If you don't plan to continue to the tutorials, take these steps to clean up the resources:
8888

8989
1. Close the browser that runs the **AzureMapDemo.html** web application.
90-
2. Navigate to the Azure portal page. Select **All resources** from the main portal page. Or, click on the menu icon in the upper left-hand corner. Select **All resources**.
91-
3. Click on your Azure Maps account. At the top of the page, click **Delete**.
90+
2. Navigate to the Azure portal. Select **All resources** from the main portal page, or select the menu icon in the upper left-hand corner then **All resources**.
91+
3. Select your Azure Maps account, then select **Delete** at the top of the page.
9292

93-
For more code examples and an interactive coding experience, see these guides:
93+
For more code examples and an interactive coding experience, see these articles:
9494

9595
* [Find an address with Azure Maps search service](how-to-search-for-address.md)
9696
* [Use the Azure Maps Map Control](how-to-use-map-control.md)
9797

9898
## Next steps
9999

100-
In this quickstart, you created your Azure Maps account and created a demo application. Take a look at the following tutorials to learn more about Azure Maps:
100+
In this quickstart, you created an Azure Maps account and a demo application. Take a look at the following tutorials to learn more about Azure Maps:
101101

102102
> [!div class="nextstepaction"]
103103
> [Search nearby points of interest with Azure Maps](tutorial-search-location.md)

articles/defender-for-cloud/custom-security-policies.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create custom security policies in Microsoft Defender for Cloud | Microsoft Docs
33
description: Azure custom policy definitions monitored by Microsoft Defender for Cloud.
44
ms.topic: how-to
5-
ms.date: 11/09/2021
5+
ms.date: 12/23/2021
66
zone_pivot_groups: manage-asc-initiatives
77
---
88

@@ -23,34 +23,32 @@ As discussed in [the Azure Policy documentation](../governance/policy/concepts/d
2323

2424
## To add a custom initiative to your subscription
2525

26-
1. From Defender for Cloud's menu, select **Security policy**.
26+
1. From Defender for Cloud's menu, open **Environment settings**.
2727

28-
1. Select a subscription or Management Group to which you would like to add a custom initiative.
29-
30-
[![Selecting a subscription for which you'll create your custom policy.](media/custom-security-policies/custom-policy-selecting-a-subscription.png)](media/custom-security-policies/custom-policy-selecting-a-subscription.png#lightbox)
28+
1. Select the relevant subscription or management group to which you would like to add a custom initiative.
3129

3230
> [!NOTE]
3331
> For your custom initiatives to be evaluated and displayed in Defender for Cloud, you must add them at the subscription level (or higher). We recommend that you select the widest scope available.
3432
35-
1. In the Security policy page, under Your custom initiatives, click **Add a custom initiative**.
33+
1. Open the **Security policy** page, and in the **Your custom initiatives** area, select **Add a custom initiative**.
3634

37-
[![Click Add a custom initiative.](media/custom-security-policies/custom-policy-add-initiative.png)](media/custom-security-policies/custom-policy-add-initiative.png#lightbox)
35+
:::image type="content" source="media/custom-security-policies/accessing-security-policy-page.png" alt-text="Screenshot of accessing the security policy page in Microsoft Defender for Cloud." lightbox="media/custom-security-policies/accessing-security-policy-page.png":::
3836

39-
The following page appears:
37+
1. In the Add custom initiatives page, review the list of custom policies already created in your organization.
4038

41-
![Create or add a policy.](media/custom-security-policies/create-or-add-custom-policy.png)
39+
- If you see one you want to assign to your subscription, select **Add**.
40+
- If there isn't an initiative in the list that meets your needs, create a new custom initiative:
4241

43-
1. In the Add custom initiatives page, review the list of custom policies already created in your organization. If you see one you want to assign to your subscription, click **Add**. If there isn't an initiative in the list that meets your needs, skip this step.
42+
1. Select **Create new**.
43+
1. Enter the definition's location and name.
44+
1. Select the policies to include and select **Add**.
45+
1. Enter any desired parameters.
46+
1. Select **Save**.
47+
1. In the Add custom initiatives page, click refresh. Your new initiative will be available.
48+
1. Select **Add** and assign it to your subscription.
4449

45-
1. To create a new custom initiative:
50+
![Create or add a policy.](media/custom-security-policies/create-or-add-custom-policy.png)
4651

47-
1. Click **Create new**.
48-
1. Enter the definition's location and name.
49-
1. Select the policies to include and click **Add**.
50-
1. Enter any desired parameters.
51-
1. Click **Save**.
52-
1. In the Add custom initiatives page, click refresh. Your new initiative will be shown as available.
53-
1. Click **Add** and assign it to your subscription.
5452

5553
> [!NOTE]
5654
> Creating new initiatives requires subscription owner credentials. For more information about Azure roles, see [Permissions in Microsoft Defender for Cloud](permissions.md).
98.7 KB
Loading

articles/defender-for-cloud/os-coverage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Also ensure your Log Analytics agent is [properly configured to send data to Def
3333
To learn more about the specific Defender for Cloud features available on Windows and Linux, see [Feature coverage for machines](supported-machines-endpoint-solutions-clouds.md).
3434

3535
> [!NOTE]
36-
> Even though **Microsoft Defender for servers** is designed to protect servers, most of its are supported for Windows 10 machines. One feature that isn't currently supported is [Defender for Cloud's integrated EDR solution: Microsoft Defender for Endpoint](integration-defender-for-endpoint.md).
36+
> Even though **Microsoft Defender for servers** is designed to protect servers, most of its features are supported for Windows 10 machines. One feature that isn't currently supported is [Defender for Cloud's integrated EDR solution: Microsoft Defender for Endpoint](integration-defender-for-endpoint.md).
3737
3838
## Managed virtual machine services <a name="virtual-machine"></a>
3939

0 commit comments

Comments
 (0)