Skip to content

Commit fd3657f

Browse files
authored
Merge pull request #195487 from MicrosoftDocs/main
4/19 AM Publish
2 parents 6ce03df + c6fcd07 commit fd3657f

File tree

67 files changed

+288
-183
lines changed

Some content is hidden

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

67 files changed

+288
-183
lines changed

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ To test the user flow:
332332

333333
### Create a password reset policy
334334

335-
Custom policies are a set of XML files that you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs that have several pre-built policies, including sign-up and sign-in, password reset, and profile editing policies. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
335+
Custom policies are a set of XML files that you upload to your Azure AD B2C tenant to define user journeys. We provide [starter packs](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) that have several pre-built policies, including sign up and sign in, password reset, and profile editing policies. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
336336

337337
::: zone-end
338338

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 02/08/2022
9+
ms.date: 04/19/2022
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -194,7 +194,7 @@ Administrators can select published authentication contexts in their Conditional
194194

195195
For more information about authentication context use in applications, see the following articles.
196196

197-
- [Microsoft Information Protection sensitivity labels to protect SharePoint sites](/microsoft-365/compliance/sensitivity-labels-teams-groups-sites#more-information-about-the-dependencies-for-the-authentication-context-option)
197+
- [Use sensitivity labels to protect content in Microsoft Teams, Microsoft 365 groups, and SharePoint sites](/microsoft-365/compliance/sensitivity-labels-teams-groups-sites)
198198
- [Microsoft Defender for Cloud Apps](/cloud-app-security/session-policy-aad?branch=pr-en-us-2082#require-step-up-authentication-authentication-context)
199199
- [Custom applications](../develop/developer-guide-conditional-access-authentication-context.md)
200200

articles/active-directory/enterprise-users/groups-assign-sensitivity-labels.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: enterprise-users
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 11/19/2021
12+
ms.date: 04/19/2022
1313
ms.author: curtand
1414
ms.reviewer: krbain
1515
ms.custom: it-pro
@@ -18,7 +18,7 @@ ms.collection: M365-identity-device-management
1818

1919
# Assign sensitivity labels to Microsoft 365 groups in Azure Active Directory
2020

21-
Azure Active Directory (Azure AD) supports applying sensitivity labels published by the [Microsoft 365 compliance center](https://sip.protection.office.com/homepage) to Microsoft 365 groups. Sensitivity labels apply to group across services like Outlook, Microsoft Teams, and SharePoint. For more information about Microsoft 365 apps support, see [Microsoft 365 support for sensitivity labels](/microsoft-365/compliance/sensitivity-labels-teams-groups-sites#support-for-the-sensitivity-labels).
21+
Azure Active Directory (Azure AD) supports applying sensitivity labels published by the [Microsoft Purview compliance portal](https://compliance.microsoft.com) to Microsoft 365 groups. Sensitivity labels apply to group across services like Outlook, Microsoft Teams, and SharePoint. For more information about Microsoft 365 apps support, see [Microsoft 365 support for sensitivity labels](/microsoft-365/compliance/sensitivity-labels-teams-groups-sites#support-for-the-sensitivity-labels).
2222

2323
> [!IMPORTANT]
2424
> To configure this feature, there must be at least one active Azure Active Directory Premium P1 license in your Azure AD organization.
@@ -121,7 +121,7 @@ After you enable this feature, the “classic” classifications for groups will
121121
122122
The sensitivity label option is only displayed for groups when all the following conditions are met:
123123
124-
1. Labels are published in the Microsoft 365 Compliance Center for this Azure AD organization.
124+
1. Labels are published in the Microsoft Purview compliance portal for this Azure AD organization.
125125
1. The feature is enabled, EnableMIPLabels is set to True in from the Azure AD PowerShell module.
126126
1. Labels are synchronized to Azure AD with the Execute-AzureAdLabelSync cmdlet in the Security & Compliance PowerShell module. It can take up to 24 hours after synchronization for the label to be available to Azure AD.
127127
1. The group is a Microsoft 365 group.
@@ -136,7 +136,7 @@ Please make sure all the conditions are met in order to assign labels to a group
136136
137137
If the label you are looking for is not in the list, this could be the case for one of the following reasons:
138138
139-
- The label might not be published in the Microsoft 365 Compliance Center. This could also apply to labels that are no longer published. Please check with your administrator for more information.
139+
- The label might not be published in the Microsoft Purview compliance portal. This could also apply to labels that are no longer published. Please check with your administrator for more information.
140140
- The label may be published, however, it is not available to the user that is signed-in. Please check with your administrator for more information on how to get access to the label.
141141
142142
### How to change the label on a group
@@ -151,7 +151,7 @@ Labels can be swapped at any time using the same steps as assigning a label to a
151151
152152
### Group setting changes to published labels aren't updated on the groups
153153
154-
When you make changes to group settings for a published label in [Microsoft 365 compliance center](https://sip.protection.office.com/homepage), those policy changes aren't automatically applied on the labeled groups. Once the sensitivity label is published and applied to groups, Microsoft recommend that you not change the group settings for the label in Microsoft 365 Compliance Center.
154+
When you make changes to group settings for a published label in the [Microsoft Purview compliance portal](https://compliance.microsoft.com), those policy changes aren't automatically applied on the labeled groups. Once the sensitivity label is published and applied to groups, Microsoft recommend that you not change the group settings for the label in the Microsoft Purview compliance portal.
155155
156156
If you must make a change, use an [Azure AD PowerShell script](https://github.com/microsoftgraph/powershell-aad-samples/blob/master/ReassignSensitivityLabelToO365Groups.ps1) to manually apply updates to the impacted groups. This method makes sure that all existing groups enforce the new setting.
157157

articles/active-directory/fundamentals/active-directory-whatis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.collection: M365-identity-device-management
2020

2121
Azure Active Directory (Azure AD) is a cloud-based identity and access management service. This service helps your employees access external resources, such as Microsoft 365, the Azure portal, and thousands of other SaaS applications. Azure Active Directory also helps them access internal resources like apps on your corporate intranet network, along with any cloud apps developed for your own organization. For more information about creating a tenant for your organization, see [Quickstart: Create a new tenant in Azure Active Directory](active-directory-access-create-new-tenant.md).
2222

23-
To learn the differences between Azure Active Directory and Azure Active Directory, see [Compare Active Directory to Azure Active Directory](active-directory-compare-azure-ad-to-ad.md). You can also refer [Microsoft Cloud for Enterprise Architects Series](/microsoft-365/solutions/cloud-architecture-models) posters to better understand the core identity services in Azure like Azure AD and Microsoft-365.
23+
To learn the differences between Active Directory and Azure Active Directory, see [Compare Active Directory to Azure Active Directory](active-directory-compare-azure-ad-to-ad.md). You can also refer [Microsoft Cloud for Enterprise Architects Series](/microsoft-365/solutions/cloud-architecture-models) posters to better understand the core identity services in Azure like Azure AD and Microsoft-365.
2424

2525
## Who uses Azure AD?
2626

articles/aks/configure-kubenet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You need the Azure CLI version 2.0.65 or later installed and configured. Run `a
3636

3737
In many environments, you have defined virtual networks and subnets with allocated IP address ranges. These virtual network resources are used to support multiple services and applications. To provide network connectivity, AKS clusters can use *kubenet* (basic networking) or Azure CNI (*advanced networking*).
3838

39-
With *kubenet*, only the nodes receive an IP address in the virtual network subnet. Pods can't communicate directly with each other. Instead, User Defined Routing (UDR) and IP forwarding is used for connectivity between pods across nodes. By default, UDRs and IP forwarding configuration is created and maintained by the AKS service, but you have to the option to [bring your own route table for custom route management][byo-subnet-route-table]. You could also deploy pods behind a service that receives an assigned IP address and load balances traffic for the application. The following diagram shows how the AKS nodes receive an IP address in the virtual network subnet, but not the pods:
39+
With *kubenet*, only the nodes receive an IP address in the virtual network subnet. Pods can't communicate directly with each other. Instead, User Defined Routing (UDR) and IP forwarding is used for connectivity between pods across nodes. By default, UDRs and IP forwarding configuration is created and maintained by the AKS service, but you have the option to [bring your own route table for custom route management][byo-subnet-route-table]. You could also deploy pods behind a service that receives an assigned IP address and load balances traffic for the application. The following diagram shows how the AKS nodes receive an IP address in the virtual network subnet, but not the pods:
4040

4141
![Kubenet network model with an AKS cluster](media/use-kubenet/kubenet-overview.png)
4242

@@ -266,4 +266,4 @@ With an AKS cluster deployed into your existing virtual network subnet, you can
266266
[express-route]: ../expressroute/expressroute-introduction.md
267267
[network-comparisons]: concepts-network.md#compare-network-models
268268
[custom-route-table]: ../virtual-network/manage-route-table.md
269-
[user-assigned managed identity]: use-managed-identity.md#bring-your-own-control-plane-mi
269+
[user-assigned managed identity]: use-managed-identity.md#bring-your-own-control-plane-mi

articles/aks/nat-gateway.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ az group create --name myresourcegroup --location southcentralus
6767

6868
```azurecli-interactive
6969
az aks create \
70-
--resource-group myresourcegroup \
70+
--resource-group myResourceGroup \
7171
--name natcluster \
7272
--node-count 3 \
73-
--outbound-type managedNATGateway \
73+
--outbound-type managedNATGateway \
7474
--nat-gateway-managed-outbound-ip-count 2 \
7575
--nat-gateway-idle-timeout 30
7676
```

articles/applied-ai-services/form-recognizer/concept-layout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ You'll need a form document. You can use our [sample form document](https://raw.
9191
* For best results, provide one clear photo or high-quality scan per document.
9292
* Supported file formats: JPEG, PNG, BMP, TIFF, and PDF (text-embedded or scanned). Text-embedded PDFs are best to eliminate the possibility of error in character extraction and location.
9393
* For PDF and TIFF, up to 2000 pages can be processed (with a free tier subscription, only the first two pages are processed).
94-
* The file size must be less than 50 MB.
94+
* The file size must be less than 50 MB (4 MB for the free tier).
9595
* Image dimensions must be between 50 x 50 pixels and 10,000 x 10,000 pixels.
9696

9797
> [!NOTE]

articles/applied-ai-services/form-recognizer/concept-read.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ See how text is extracted from forms and documents using the Form Recognizer Stu
6666
* For best results, provide one clear photo or high-quality scan per document.
6767
* Supported file formats: JPEG, PNG, BMP, TIFF, and PDF (text-embedded or scanned). Text-embedded PDFs are best to eliminate the possibility of error in character extraction and location.
6868
* For PDF and TIFF, up to 2000 pages can be processed (with a free tier subscription, only the first two pages are processed).
69-
* The file size must be less than 50 MB.
69+
* The file size must be less than 50 MB (4 MB for the free tier)
7070
* Image dimensions must be between 50 x 50 pixels and 10,000 x 10,000 pixels.
7171

7272
## Supported languages and locales

articles/azure-arc/data/connectivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Azure Arc-enabled data services provides you the option to connect to Azure in t
2525

2626
The connectivity mode provides you the flexibility to choose how much data is sent to Azure and how users interact with the Arc Data Controller. Depending on the connectivity mode that is chosen, some functionality of Azure Arc-enabled data services may or may not be available.
2727

28-
Importantly, if the Azure Arc-enabled data services are directly connected to Azure, then users can use [Azure Resource Manager APIs](/rest/api/resources/), the Azure CLI, and the Azure portal to operate the Azure Arc data services. The experience in directly connected mode is much like how you would use any other Azure service with provisioning/de-provisioning, scaling, configuring, and so on all in the Azure portal. If the Azure Arc-enabled data services are indirectly connected to Azure, then the Azure portal is a read-only view. You can see the inventory of SQL managed instances and Postgres Hyperscale instances that you have deployed and the details about them, but you cannot take action on them in the Azure portal. In the indirectly connected mode, all actions must be taken locally using Azure Data Studio, the appropriate CLI, or Kubernetes native tools like kubectl.
28+
Importantly, if the Azure Arc-enabled data services are directly connected to Azure, then users can use [Azure Resource Manager APIs](/rest/api/resources/), the Azure CLI, and the Azure portal to operate the Azure Arc data services. The experience in directly connected mode is much like how you would use any other Azure service with provisioning/de-provisioning, scaling, configuring, and so on all in the Azure portal. If the Azure Arc-enabled data services are indirectly connected to Azure, then the Azure portal is a read-only view. You can see the inventory of SQL managed instances and PostgreSQL Hyperscale instances that you have deployed and the details about them, but you cannot take action on them in the Azure portal. In the indirectly connected mode, all actions must be taken locally using Azure Data Studio, the appropriate CLI, or Kubernetes native tools like kubectl.
2929

3030
Additionally, Azure Active Directory and Azure Role-Based Access Control can be used in the directly connected mode only because there is a dependency on a continuous and direct connection to Azure to provide this functionality.
3131

articles/azure-arc/data/view-arc-data-services-inventory-in-azure-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can view your Azure Arc-enabled data services in the Azure portal or in your
1717

1818
## View resources in Azure portal
1919

20-
After you upload your [metrics, logs](upload-metrics-and-logs-to-azure-monitor.md), or [usage](view-billing-data-in-azure.md), you can view your Azure Arc-enabled SQL managed instances or Azure Arc-enabled Postgres Hyperscale server groups in the Azure portal. To view your resource in the [Azure portal](https://portal.azure.com), follow these steps:
20+
After you upload your [metrics, logs](upload-metrics-and-logs-to-azure-monitor.md), or [usage](view-billing-data-in-azure.md), you can view your Azure Arc-enabled SQL managed instances or Azure Arc-enabled PostgreSQL Hyperscale server groups in the Azure portal. To view your resource in the [Azure portal](https://portal.azure.com), follow these steps:
2121

2222
1. Go to **All services**.
2323
1. Search for your database instance type.

0 commit comments

Comments
 (0)