Skip to content

Commit fce130c

Browse files
authored
Merge pull request #228862 from MicrosoftDocs/main
Publish to live, Tuesday 4 AM PST, 2/28
2 parents 9c35112 + a2e0c3d commit fce130c

File tree

249 files changed

+2732
-2026
lines changed

Some content is hidden

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

249 files changed

+2732
-2026
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,6 +1875,11 @@
18751875
"redirect_url": "/azure/active-directory/hybrid/migrate-from-federation-to-cloud-authentication",
18761876
"redirect_document_id": true
18771877
},
1878+
{
1879+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-deployment-checklist-p2.md",
1880+
"redirect_url": "/azure/active-directory/fundamentals/concept-secure-remote-workers",
1881+
"redirect_document_id": true
1882+
},
18781883
{
18791884
"source_path_from_root": "/articles/active-directory/conditional-access/app-based-mfa.md",
18801885
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5968,6 +5968,16 @@
59685968
"redirect_url": "/azure/architecture/service-fabric/migrate-from-cloud-services",
59695969
"redirect_document_id": false
59705970
},
5971+
{
5972+
"source_path_from_root": "/articles/batch/batch-custom-image-pools-to-azure-compute-gallery-migration-guide.md",
5973+
"redirect_url": "/azure/batch",
5974+
"redirect_document_id": false
5975+
},
5976+
{
5977+
"source_path_from_root": "/articles/batch/batch-pools-to-simplified-compute-node-communication-model-migration-guide.md",
5978+
"redirect_url": "/azure/batch",
5979+
"redirect_document_id": false
5980+
},
59715981
{
59725982
"source_path_from_root": "/articles/batch/big-compute-resources.md",
59735983
"redirect_url": "/azure/architecture/topics/high-performance-computing/",
33.2 KB
Loading
45.1 KB
Loading
70.8 KB
Loading

articles/active-directory-b2c/quickstart-single-page-app.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: quickstart
11-
ms.date: 01/13/2022
11+
ms.date: 02/23/2023
1212
ms.author: godonnell
1313
ms.subservice: B2C
1414
ms.custom: mode-other
@@ -53,24 +53,24 @@ In this quickstart, you use a single-page application to sign in using a social
5353

5454
1. Browse to the URL of the application. For example, `http://localhost:6420`.
5555

56-
![Single-page application sample app shown in browser](./media/quickstart-single-page-app/sample-app-spa.png)
56+
:::image type="content" source="./media/quickstart-single-page-app/sample-app-spa.png" alt-text="Screenshot of single-page application sample app shown in browser window." lightbox="./media/quickstart-single-page-app/sample-app-spa.png":::
5757

5858
## Sign in using your account
5959

6060
1. Select **Sign In** to start the user journey.
6161
1. Azure AD B2C presents a sign-in page for a fictitious company called "Fabrikam" for the sample web application. To sign up using a social identity provider, select the button of the identity provider you want to use.
6262

63-
![Sign In or Sign Up page showing identity provider buttons](./media/quickstart-single-page-app/sign-in-or-sign-up-spa.png)
63+
:::image type="content" source="./media/quickstart-single-page-app/sign-in-or-sign-up-spa.png" alt-text="Screenshot of Sign In or Sign Up page showing identity provider buttons" lightbox="./media/quickstart-single-page-app/sign-in-or-sign-up-spa.png":::
6464

65-
You authenticate (sign in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city.
65+
You authenticate (sign in) using your social account credentials and authorize the application to read information from your social account. By granting access, the application can retrieve profile information from the social account such as your name and city.
6666

6767
1. Finish the sign-in process for the identity provider.
6868

6969
## Access a protected API resource
7070

7171
Select **Call API** to have your display name returned from the web API as a JSON object.
7272

73-
![Sample application in browser showing the web API response](./media/quickstart-single-page-app/call-api-spa.png)
73+
:::image type="content" source="./media/quickstart-single-page-app/call-api-spa.png" alt-text="Screenshot of web API response showing in sample application in browser window." lightbox="./media/quickstart-single-page-app/sample-app-spa.png":::
7474

7575
The sample single-page application includes an access token in the request to the protected web API resource.
7676

articles/active-directory/conditional-access/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
href: require-tou.md
1111
- name: Tutorials
1212
items:
13-
- name: Require Azure AD Multi-Factor Authentication
13+
- name: Require Azure AD Multifactor Authentication
1414
href: ../authentication/tutorial-enable-azure-mfa.md?toc=/azure/active-directory/conditional-access/toc.json&bc=/azure/active-directory/conditional-access/breadcrumb/toc.json
1515
- name: Concepts
1616
expanded: false

articles/active-directory/conditional-access/concept-condition-filters-for-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Policy 1: All users with the directory role of Global Administrator, accessing t
5454
1. Under **Exclude**, select **Users and groups** and choose your organization's emergency access or break-glass accounts.
5555
1. Select **Done**.
5656
1. Under **Cloud apps or actions** > **Include**, select **Select apps**, and select **Microsoft Azure Management**.
57-
1. Under **Access controls** > **Grant**, select **Grant access**, **Require multi-factor authentication**, and **Require device to be marked as compliant**, then select **Select**.
57+
1. Under **Access controls** > **Grant**, select **Grant access**, **Require multifactor authentication**, and **Require device to be marked as compliant**, then select **Select**.
5858
1. Confirm your settings and set **Enable policy** to **On**.
5959
1. Select **Create** to create to enable your policy.
6060

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ User actions are tasks that can be performed by a user. Currently, Conditional A
180180

181181
- **Register security information**: This user action allows Conditional Access policy to enforce when users who are enabled for combined registration attempt to register their security information. More information can be found in the article, [Combined security information registration](../authentication/concept-registration-mfa-sspr-combined.md).
182182

183-
- **Register or join devices**: This user action enables administrators to enforce Conditional Access policy when users [register](../devices/concept-azure-ad-register.md) or [join](../devices/concept-azure-ad-join.md) devices to Azure AD. It provides granularity in configuring multi-factor authentication for registering or joining devices instead of a tenant-wide policy that currently exists. There are three key considerations with this user action:
184-
- `Require multi-factor authentication` is the only access control available with this user action and all others are disabled. This restriction prevents conflicts with access controls that are either dependent on Azure AD device registration or not applicable to Azure AD device registration.
183+
- **Register or join devices**: This user action enables administrators to enforce Conditional Access policy when users [register](../devices/concept-azure-ad-register.md) or [join](../devices/concept-azure-ad-join.md) devices to Azure AD. It provides granularity in configuring multifactor authentication for registering or joining devices instead of a tenant-wide policy that currently exists. There are three key considerations with this user action:
184+
- `Require multifactor authentication` is the only access control available with this user action and all others are disabled. This restriction prevents conflicts with access controls that are either dependent on Azure AD device registration or not applicable to Azure AD device registration.
185185
- `Client apps`, `Filters for devices` and `Device state` conditions aren't available with this user action since they're dependent on Azure AD device registration to enforce Conditional Access policies.
186-
- When a Conditional Access policy is enabled with this user action, you must set **Azure Active Directory** > **Devices** > **Device Settings** - `Devices to be Azure AD joined or Azure AD registered require Multi-Factor Authentication` to **No**. Otherwise, the Conditional Access policy with this user action isn't properly enforced. More information about this device setting can found in [Configure device settings](../devices/device-management-azure-portal.md#configure-device-settings).
186+
- When a Conditional Access policy is enabled with this user action, you must set **Azure Active Directory** > **Devices** > **Device Settings** - `Devices to be Azure AD joined or Azure AD registered require Multifactor Authentication` to **No**. Otherwise, the Conditional Access policy with this user action isn't properly enforced. More information about this device setting can found in [Configure device settings](../devices/device-management-azure-portal.md#configure-device-settings).
187187

188188
## Authentication context
189189

articles/active-directory/conditional-access/concept-conditional-access-conditions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ This setting has an impact on access attempts made from the following mobile app
177177
- When creating a policy assigned to Exchange ActiveSync clients, **Exchange Online** should be the only cloud application assigned to the policy.
178178
- Organizations can narrow the scope of this policy to specific platforms using the **Device platforms** condition.
179179

180-
If the access control assigned to the policy uses **Require approved client app**, the user is directed to install and use the Outlook mobile client. In the case that **Multi-factor authentication**, **Terms of use**, or **custom controls** are required, affected users are blocked, because basic authentication doesn’t support these controls.
180+
If the access control assigned to the policy uses **Require approved client app**, the user is directed to install and use the Outlook mobile client. In the case that **Multifactor Authentication**, **Terms of use**, or **custom controls** are required, affected users are blocked, because basic authentication doesn’t support these controls.
181181

182182
For more information, see the following articles:
183183

0 commit comments

Comments
 (0)