Skip to content

Commit aa2d928

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fresh
2 parents f128aa6 + 381e6eb commit aa2d928

File tree

168 files changed

+3471
-530
lines changed

Some content is hidden

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

168 files changed

+3471
-530
lines changed

articles/active-directory/authentication/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@
164164
href: howto-password-ban-bad-on-premises-agent-versions.md
165165
- name: Run a registration campaign
166166
href: how-to-mfa-registration-campaign.md
167-
- name: Use number matching (Preview)
167+
- name: Use number matching
168168
href: how-to-mfa-number-match.md
169-
- name: Use additional context (Preview)
169+
- name: Use additional context
170170
href: how-to-mfa-additional-context.md
171171
- name: Use Microsoft managed settings
172172
href: how-to-mfa-microsoft-managed.md

articles/active-directory/authentication/concept-certificate-based-authentication-smartcard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Users will get a primary refresh token (PRT) from Azure Active Directory after t
3737
## Restrictions and caveats
3838

3939
- The Windows login only works with the latest preview build of Windows 11. We are working to backport the functionality to Windows 10 and Windows Server.
40-
- Only Windows machines that are joined to either or a hybrid environment can test SmartCard logon.
40+
- Only Windows machines that are joined to either Azure AD or a hybrid environment can test SmartCard logon.
4141
- Like in the other Azure AD CBA scenarios, the user must be on a managed domain or using staged rollout and cannot use a federated authentication model.
4242

4343
## Next steps

articles/active-directory/authentication/how-to-mfa-additional-context.md

Lines changed: 390 additions & 13 deletions
Large diffs are not rendered by default.

articles/active-directory/authentication/how-to-mfa-number-match.md

Lines changed: 266 additions & 15 deletions
Large diffs are not rendered by default.
-722 Bytes
Loading
-1.76 KB
Loading
-2.36 KB
Loading

articles/active-directory/develop/msal-node-migration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const msal = require('@azure/msal-node');
7171

7272
const pca = new msal.PublicClientApplication({
7373
auth: {
74-
clientId = "YOUR_CLIENT_ID"
74+
clientId: "YOUR_CLIENT_ID"
7575
}
7676
});
7777
```
@@ -86,8 +86,8 @@ const msal = require('@azure/msal-node');
8686

8787
const cca = new msal.ConfidentialClientApplication({
8888
auth: {
89-
clientId = "YOUR_CLIENT_ID",
90-
clientSecret = "YOUR_CLIENT_SECRET"
89+
clientId: "YOUR_CLIENT_ID",
90+
clientSecret: "YOUR_CLIENT_SECRET"
9191
}
9292
});
9393
```

articles/active-directory/hybrid/how-to-connect-sync-whatis.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ The Azure Active Directory Connect synchronization services (Azure AD Connect sy
2424
This topic is the home for **Azure AD Connect sync** (also called **sync engine**) and lists links to all other topics related to it. For links to Azure AD Connect, see [Integrating your on-premises identities with Azure Active Directory](whatis-hybrid-identity.md).
2525

2626
The sync service consists of two components, the on-premises **Azure AD Connect sync** component and the service side in Azure AD called **Azure AD Connect sync service**.
27+
>[!IMPORTANT]
28+
>Azure AD Connect Cloud Sync is a new offering from Microsoft designed to meet and accomplish your hybrid identity goals for synchronization of users, groups, and contacts to Azure AD. It accomplishes this by using the Azure AD Cloud provisioning agent instead of the Azure AD Connect application. Azure AD Cloud Sync is replacing Azure AD Connect sync, which will be retired after Cloud Sync has full functional parity with Connect sync. The remainder of this article is about AADConnect sync, but we encourage customers to review the features and advantages of Cloud Sync before deploying AADConnect sync.
29+
>
30+
>To find out if you are already eligible for Cloud Sync, please verify your requirements in [this wizard](https://admin.microsoft.com/adminportal/home?Q=setupguidance#/modernonboarding/identitywizard).
31+
>
32+
>To learn more about Cloud Sync please read [this article](https://docs.microsoft.com/azure/active-directory/cloud-sync/what-is-cloud-sync), or watch this [short video](https://www.microsoft.com/en-us/videoplayer/embed/RWJ8l5).
33+
>
34+
2735

2836
## Azure AD Connect sync topics
2937
| Topic | What it covers and when to read |

articles/aks/azure-cni-overlay.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ With Azure CNI Overlay, the cluster nodes are deployed into an Azure Virtual Net
1515

1616
> [!NOTE]
1717
> - Azure CNI Overlay is currently only available in US West Central region.
18-
> - Azure CNI Overlay does not currently support _v5 VM SKUs.
1918
2019
## Overview of overlay networking
2120

0 commit comments

Comments
 (0)