Skip to content

Commit 278ab44

Browse files
authored
Merge pull request #215148 from MicrosoftDocs/main
10/19 PM Publish
2 parents 0caae39 + 4dd6a46 commit 278ab44

File tree

159 files changed

+1642
-1955
lines changed

Some content is hidden

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

159 files changed

+1642
-1955
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,11 @@
385385
"redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
386386
"redirect_document_id": false
387387
},
388+
{
389+
"source_path_from_root": "/articles/active-directory/saas-apps/eopen-cm-tutorial.md",
390+
"redirect_url": "/azure/active-directory/saas-apps/e2open-cm-tutorial",
391+
"redirect_document_id": false
392+
},
388393
{
389394
"source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
390395
"redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -10861,57 +10866,57 @@
1086110866
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1086210867
"redirect_document_id": false
1086310868
},
10864-
{
10869+
{
1086510870
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
1086610871
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1086710872
"redirect_document_id": false
1086810873
},
10869-
{
10874+
{
1087010875
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
1087110876
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1087210877
"redirect_document_id": false
1087310878
},
10874-
{
10879+
{
1087510880
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
1087610881
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1087710882
"redirect_document_id": false
1087810883
},
10879-
{
10884+
{
1088010885
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
1088110886
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1088210887
"redirect_document_id": false
1088310888
},
10884-
{
10889+
{
1088510890
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
1088610891
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1088710892
"redirect_document_id": false
1088810893
},
10889-
{
10894+
{
1089010895
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
1089110896
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
1089210897
"redirect_document_id": false
10893-
},
10894-
{
10898+
},
10899+
{
1089510900
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
1089610901
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
1089710902
"redirect_document_id": false
1089810903
},
10899-
{
10904+
{
1090010905
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
1090110906
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
1090210907
"redirect_document_id": false
1090310908
},
10904-
{
10909+
{
1090510910
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-troubleshooting-support-howto.md",
1090610911
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1090710912
"redirect_document_id": false
1090810913
},
10909-
{
10914+
{
1091010915
"source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
1091110916
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1091210917
"redirect_document_id": false
1091310918
},
10914-
{
10919+
{
1091510920
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-playbook.md",
1091610921
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide",
1091710922
"redirect_document_id": false

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,31 @@
753753
"redirect_url": "/azure/frontdoor/create-front-door-cli",
754754
"redirect_document_id": false
755755
},
756+
{
757+
"source_path_from_root": "/articles/aks/aks-resource-health.md",
758+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
759+
"redirect_document_id": false
760+
},
761+
{
762+
"source_path_from_root": "/articles/aks/concepts-diagnostics.md",
763+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
764+
"redirect_document_id": false
765+
},
766+
{
767+
"source_path_from_root": "/articles/aks/node-access.md",
768+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
769+
"redirect_document_id": false
770+
},
771+
{
772+
"source_path_from_root": "/articles/aks/troubleshooting.md",
773+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
774+
"redirect_document_id": false
775+
},
776+
{
777+
"source_path_from_root": "/articles/aks/troubleshoot-linux.md",
778+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
779+
"redirect_document_id": false
780+
},
756781
{
757782
"source_path_from_root": "/articles/cdn/index.yml",
758783
"redirect_url": "/azure/frontdoor",

articles/active-directory-b2c/enable-authentication-spa-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ The resources referenced by the *index.html* file are detailed in the following
109109
|[`ui.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/ui.js) | Controls the UI elements. |
110110
| | |
111111

112-
To render the SPA index file, in the *myApp* folder, create a file named *index.html*, which contains the following HTML snippet.
112+
To render the SPA index file, in the *myApp* folder, create a file named *index.html*, which contains the following HTML snippet:
113113

114114
```html
115115
<!DOCTYPE html>
@@ -221,7 +221,7 @@ To specify your Azure AD B2C user flows, do the following:
221221

222222
In this step, implement the methods to initialize the sign-in flow, API access token acquisition, and the sign-out methods.
223223

224-
For more information, see the [MSAL PublicClientApplication class reference](https://azuread.github.io/microsoft-authentication-library-for-js/ref/classes/_azure_msal_browser.publicclientapplication.html), and [Use the Microsoft Authentication Library (MSAL) to sign in the user](../active-directory/develop/tutorial-v2-javascript-spa.md#use-the-microsoft-authentication-library-msal-to-sign-in-the-user) articles.
224+
For more information, see the [MSAL PublicClientApplication class reference](https://azuread.github.io/microsoft-authentication-library-for-js/ref/classes/_azure_msal_browser.publicclientapplication.html), and [Use the Microsoft Authentication Library (MSAL) to sign in the user](../active-directory/develop/tutorial-v2-javascript-spa.md#use-the-msal-to-sign-in-the-user) articles.
225225

226226
To sign in the user, do the following:
227227

@@ -442,7 +442,7 @@ To call your web API by using the token you acquired, do the following:
442442

443443
## Step 10: Add the UI elements reference
444444

445-
The SPA app uses JavaScript to control the UI elements. For example, it displays the sign-in and sign-out buttons, and renders the users ID token claims to the screen.
445+
The SPA app uses JavaScript to control the UI elements. For example, it displays the sign-in and sign-out buttons, and renders the users' ID token claims to the screen.
446446
447447
To add the UI elements reference, do the following:
448448

articles/active-directory-b2c/threat-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The smart lockout feature uses many factors to determine when an account should
5555
- Passwords such as 12456! and 1234567! (or newAccount1234 and newaccount1234) are so similar that the algorithm interprets them as human error and counts them as a single try.
5656
- Larger variations in pattern, such as 12456! and ABCD2!, are counted as separate tries.
5757

58-
When testing the smart lockout feature, use a distinctive pattern for each password you enter. Consider using password generation web apps, such as `https://passwordsgenerator.net/`.
58+
When testing the smart lockout feature, use a distinctive pattern for each password you enter. Consider using password generation web apps, such as `https://password-generator.net/`.
5959

6060
When the smart lockout threshold is reached, you'll see the following message while the account is locked: **Your account is temporarily locked to prevent unauthorized use. Try again later**. The error messages can be [localized](localization-string-ids.md#sign-up-or-sign-in-error-messages).
6161

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ ms.collection: M365-identity-device-management
2020
Before combined registration, users registered authentication methods for Azure AD Multi-Factor Authentication and self-service password reset (SSPR) separately. People were confused that similar methods were used for multifactor authentication and SSPR but they had to register for both features. Now, with combined registration, users can register once and get the benefits of both multifactor authentication and SSPR. We recommend this video on [How to enable and configure SSPR in Azure AD](https://www.youtube.com/watch?v=rA8TvhNcCvQ)
2121

2222
> [!NOTE]
23-
> Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration.
24-
>
25-
> After Sept. 30th, 2022, all users will register security information through the combined registration experience.
23+
> Effective Oct. 1st, 2022, we will begin to enable combined registration for all users in Azure AD tenants created before August 15th, 2020. Tenants created after this date are enabled with combined registration.
2624
2725
This article outlines what combined security registration is. To get started with combined security registration, see the following article:
2826

articles/active-directory/authentication/fido2-compatibility.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ ms.subservice: authentication
88
ms.topic: conceptual
99
ms.date: 02/02/2021
1010

11-
ms.author: nichola
12-
author: knicholasa
11+
author: janicericketts
12+
ms.author: jricketts
1313
manager: martinco
1414
ms.reviewer:
1515

articles/active-directory/authentication/howto-registration-mfa-sspr-combined.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ ms.collection: M365-identity-device-management
2020
Before combined registration, users registered authentication methods for Azure AD Multi-Factor Authentication and self-service password reset (SSPR) separately. People were confused that similar methods were used for Azure AD Multi-Factor Authentication and SSPR but they had to register for both features. Now, with combined registration, users can register once and get the benefits of both Azure AD Multi-Factor Authentication and SSPR.
2121

2222
> [!NOTE]
23-
> Starting on August 15th 2020, all new Azure AD tenants will be automatically enabled for combined registration. Tenants created after this date will be unable to utilize the legacy registration workflows.
24-
>
25-
> After Sept. 30th, 2022, all users will register security information through the combined registration experience.
23+
> Effective Oct. 1st, 2022, we will begin to enable combined registration for all users in Azure AD tenants created before August 15th, 2020. Tenants created after this date are enabled with combined registration.
2624
2725
To make sure you understand the functionality and effects before you enable the new experience, see the [Combined security information registration concepts](concept-registration-mfa-sspr-combined.md).
2826

articles/active-directory/develop/app-resilience-continuous-access-evaluation.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
title: "How to use Continuous Access Evaluation enabled APIs in your applications"
33
description: How to increase app security and resilience by adding support for Continuous Access Evaluation, enabling long-lived access tokens that can be revoked based on critical events and policy evaluation.
44
services: active-directory
5-
author: knicholasa
6-
manager: CelesteDG
7-
5+
manager: martinco
86
ms.service: active-directory
97
ms.subservice: develop
108
ms.topic: conceptual
119
ms.workload: identity
1210
ms.date: 07/09/2021
13-
ms.author: nichola
11+
author: janicericketts
12+
ms.author: jricketts
1413
ms.reviewer:
1514
# Customer intent: As an application developer, I want to learn how to use Continuous Access Evaluation for building resiliency through long-lived, refreshable tokens that can be revoked based on critical events and policy evaluation.
1615
---

articles/active-directory/develop/mobile-sso-support-overview.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
title: Support single sign-on and app protection policies in mobile apps you develop
33
description: Explanation and overview of building mobile applications that support single sign-on and app protection policies using the Microsoft identity platform and integrating with Azure Active Directory.
44
services: active-directory
5-
author: knicholasa
6-
manager: CelesteDG
7-
5+
manager: martinco
86
ms.service: active-directory
97
ms.subservice: develop
108
ms.topic: conceptual
119
ms.workload: identity
1210
ms.date: 10/14/2020
13-
ms.author: nichola
11+
author: janicericketts
12+
ms.author: jricketts
1413
ms.custom: has-adal-ref
1514

1615
#Customer intent: As an app developer, I want to know how to implement an app that supports single sign-on and app protection policies using the Microsoft identity platform and integrating with Azure Active Directory.
@@ -77,4 +76,4 @@ Finally, [add the Intune SDK](/mem/intune/developer/app-sdk-get-started) to your
7776
- [Authorization agents and how to enable them](./msal-android-single-sign-on.md)
7877
- [Get started with the Microsoft Intune App SDK](/mem/intune/developer/app-sdk-get-started)
7978
- [Configure settings for the Intune App SDK](/mem/intune/developer/app-sdk-ios#configure-settings-for-the-intune-app-sdk)
80-
- [Microsoft Intune protected apps](/mem/intune/apps/apps-supported-intune-apps)
79+
- [Microsoft Intune protected apps](/mem/intune/apps/apps-supported-intune-apps)

articles/active-directory/develop/scenario-desktop-acquire-token-username-password.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ For more information on all the modifiers that can be applied to `AcquireTokenBy
254254

255255
# [Java](#tab/java)
256256

257-
The following extract is from the [MSAL Java code samples](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/src/samples/public-client/).
257+
The following extract is from the [MSAL Java code samples](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/dev/msal4j-sdk/src/samples/public-client/UsernamePasswordFlow.java).
258258

259259
```java
260260
PublicClientApplication pca = PublicClientApplication.builder(clientId)

0 commit comments

Comments
 (0)