Skip to content

Commit 380c080

Browse files
Merge pull request #31720 from MicrosoftDocs/main
[AutoPublish] main to live - 04/28 10:59 PDT | 04/28 23:29 IST
2 parents d701cb6 + a1e25f8 commit 380c080

10 files changed

Lines changed: 44 additions & 42 deletions

microsoft-365/admin/breadcrumb/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ items:
66
tocHref: /microsoft-365/
77
topicHref: /microsoft-365/index
88
- name: Microsoft 365
9-
tocHref: /mem/
9+
tocHref: /intune/
1010
topicHref: /microsoft-365/index
1111
- name: Microsoft 365
1212
tocHref: /microsoft-365-apps/
@@ -31,7 +31,7 @@ items:
3131
tocHref: /microsoftsearch/
3232
topicHref: /microsoft-365/admin/index
3333
- name: Microsoft 365 admin center
34-
tocHref: /mem/analytics/
34+
tocHref: /intune/endpoint-analytics/
3535
topicHref: /microsoft-365/admin/index
3636
- name: Microsoft 365 admin center
3737
tocHref: /autopilot/

microsoft-365/core/TOC.yml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
href: ../admin/admin-overview/what-is-microsoft-365-for-business.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
1313
- name: Why choose Microsoft 365 for business premium?
1414
href: ../admin/security-and-compliance/m365bp-security-benefits.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
15+
- name: Understand the Microsoft Business Premium environment
16+
href: ../business-premium/m365bp-mdb-maintain-environment.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
1517
- name: Plan your setup
1618
href: ../admin/setup/plan-your-setup.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
1719
- name: License assignment overview
@@ -66,10 +68,18 @@
6668
items:
6769
- name: Prepare hybrid-identity for directory synchronization
6870
href: ../enterprise/prepare-for-directory-synchronization.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
71+
- name: Hybrid modern authentication for Skype for Business and Exchange servers
72+
href: ../enterprise/hybrid-modern-auth-overview.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
73+
- name: Modern authentication works for Office 2016, Office 2019 apps
74+
href: ../enterprise/modern-auth-for-office-2013-and-2016.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
6975
- name: User accounts
7076
items:
7177
- name: Plan where and how to manage user accounts
7278
href: ../enterprise/manage-microsoft-365-accounts.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
79+
- name: Understand user account passwords
80+
href: ../enterprise/manage-microsoft-365-passwords.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
81+
- name: Understand Microsoft 365 groups
82+
href: ../enterprise/manage-microsoft-365-groups.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
7383
- name: Understand user account licenses
7484
href: ../enterprise/assign-licenses-to-user-accounts.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
7585
items:
@@ -83,24 +93,16 @@
8393
href: ../admin/email/office-365-user-email-settings.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
8494
- name: Understand shared mailboxes
8595
href: ../admin/email/about-shared-mailboxes.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
96+
- name: Microsoft 365 identity governance
97+
href: ../enterprise/manage-microsoft-365-identity-governance.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
8698
- name: Tenant
8799
items:
88100
- name: Tenant roadmap
89101
href: ../enterprise/tenant-roadmap-microsoft-365.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
90-
- name: Understand subscriptions, licenses, accounts, and tenants
91-
href: ../enterprise/subscriptions-licenses-accounts-and-tenants-for-microsoft-cloud-offerings.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
92-
- name: Understand the Microsoft Business Premium environment
93-
href: ../business-premium/m365bp-mdb-maintain-environment.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
94-
- name: Understand how to use third-party SSL certificates
95-
href: ../enterprise/plan-for-third-party-ssl-certificates.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
96-
- name: Understand hybrid modern authentication for Skype for Business and Exchange servers
97-
href: ../enterprise/hybrid-modern-auth-overview.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
98-
items:
99-
- name: Understand how modern authentication works for Office 2016, Office 2019 apps
100-
href: ../enterprise/modern-auth-for-office-2013-and-2016.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
101-
- name: Understand tenant isolation
102-
href: /compliance/assurance/assurance-microsoft-365-isolation-controls?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
102+
- name: Tenant isolation
103103
items:
104+
- name: Understand tenant isolation
105+
href: /compliance/assurance/assurance-microsoft-365-isolation-controls?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
104106
- name: Understand Microsoft Entra ID tenant isolation and access control
105107
href: ../enterprise/microsoft-365-isolation-in-azure-active-directory.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
106108
- name: Understand monitoring and testing tenant boundaries
@@ -109,7 +111,7 @@
109111
href: ../enterprise/microsoft-365-isolation-in-microsoft-365.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
110112
- name: Understand resource limits
111113
href: /compliance/assurance/assurance-resource-limits?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
112-
- name: Understand integration
114+
- name: Tenant integrations
113115
items:
114116
- name: Integrate with custom apps and Microsoft Entra ID
115117
href: ../enterprise/integrated-apps-and-azure-ads.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
@@ -145,12 +147,6 @@
145147
href: ../enterprise/migration-orchestrator-7-end-user-exp.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
146148
- name: Cross-tenant migration with orchestrator FAQ
147149
href: ../enterprise/migration-orchestrator-8-faq.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
148-
- name: Plan and set up Microsoft 365 identity governance
149-
href: ../enterprise/manage-microsoft-365-identity-governance.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
150-
- name: Understand user account passwords
151-
href: ../enterprise/manage-microsoft-365-passwords.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
152-
- name: Understand Microsoft 365 groups
153-
href: ../enterprise/manage-microsoft-365-groups.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
154150
- name: Organizational messages
155151
href: ../admin/misc/organizational-messages-microsoft-365.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
156152
- name: Domains
@@ -238,6 +234,8 @@
238234
href: ../enterprise/microsoft-365-vpn-split-tunnel.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
239235
- name: Common VPN split tunneling scenarios
240236
href: ../enterprise/microsoft-365-vpn-common-scenarios.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
237+
- name: Understand how to use third-party SSL certificates
238+
href: ../enterprise/plan-for-third-party-ssl-certificates.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
241239
- name: Content delivery networks
242240
href: ../enterprise/content-delivery-networks.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
243241
- name: IPv6 support
@@ -307,6 +305,10 @@
307305
href: ../enterprise/connect-an-on-premises-network-to-a-microsoft-azure-virtual-network.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
308306
- name: Deploy a directory synchronization server in Azure IaaS
309307
href: ../enterprise/deploy-microsoft-365-directory-synchronization-dirsync-in-microsoft-azure.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
308+
- name: Configure Exchange server on-premises to use Hybrid Modern Authentication
309+
href: ../enterprise/configure-exchange-server-for-hybrid-modern-authentication.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
310+
- name: Remove or disable Hybrid Modern Authentication from Exchange
311+
href: ../enterprise/remove-or-disable-hybrid-modern-authentication-from-skype-for-business-and-excha.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
310312
- name: Synchronize domain users to Microsoft 365
311313
href: ../admin/setup/manage-domain-users.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
312314
- name: User accounts
@@ -366,8 +368,6 @@
366368
- name: Tenant
367369
href:
368370
items:
369-
- name: Configure Exchange server on-premises to use Hybrid Modern Authentication
370-
href: ../enterprise/configure-exchange-server-for-hybrid-modern-authentication.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
371371
- name: Implement a multi-tenant organization (MTO)
372372
href:
373373
items:
@@ -400,7 +400,7 @@
400400
href: ../admin/setup/customize-sign-in-page.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
401401
- name: Customize your organization's theme
402402
href: ../admin/setup/customize-your-organization-theme.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
403-
- name: Domains and DNS
403+
- name: Domains
404404
items:
405405
- name: Add or replace a onmicrosoft.com fallback domain
406406
href: ../admin/setup/add-or-replace-your-onmicrosoftcom-domain.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
@@ -502,7 +502,7 @@
502502
- name: Onboard devices to Microsoft Defender for Business
503503
href: /defender-business/mdb-onboard-devices?toc=/microsoft-365/business-premium/toc.json&bc=/microsoft-365/business-premium/breadcrumb/toc.json
504504
- name: Use Windows Autopilot to set up and or reset devices
505-
href: /mem/autopilot/windows-autopilot?toc=/microsoft-365/business-premium/toc.json&bc=/microsoft-365/business-premium/breadcrumb/toc.json
505+
href: /autopilot/overview?toc=/microsoft-365/business-premium/toc.json&bc=/microsoft-365/business-premium/breadcrumb/toc.json
506506
- name: Network
507507
href:
508508
items:
@@ -739,10 +739,6 @@
739739
href: ../enterprise/manage-multitenant-org-settings.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
740740
- name: Manage multiple tenants in the Microsoft 365 admin center
741741
href: ../admin/multi-tenant/manage.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
742-
- name: Remove or disable Hybrid Modern Authentication from Exchange
743-
href: ../enterprise/remove-or-disable-hybrid-modern-authentication-from-skype-for-business-and-excha.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
744-
- name: Transfer a domain from Microsoft to another host
745-
href: ../admin/get-help-with-domains/transfer-a-domain-from-microsoft-to-another-host.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
746742
- name: Manage industry news
747743
href: ../admin/manage/manage-industry-news.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
748744
- name: Manage Office Scripts settings
@@ -753,6 +749,8 @@
753749
href: ../admin/get-help-with-domains/remove-a-domain.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
754750
- name: Change nameservers to set up Microsoft 365 with any domain registrar
755751
href: ../admin/get-help-with-domains/change-nameservers-at-any-domain-registrar.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
752+
- name: Transfer a domain from Microsoft to another host
753+
href: ../admin/get-help-with-domains/transfer-a-domain-from-microsoft-to-another-host.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
756754
- name: Troubleshoot domain issues
757755
href: ../admin/get-help-with-domains/find-and-fix-issues.md?toc=/microsoft-365/core/toc.json&bc=/microsoft-365/core/breadcrumb/toc.json
758756
- name: Integrated apps

microsoft-365/core/breadcrumb/toc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,8 @@ items:
5858
- name: Microsoft 365 Core
5959
tocHref: /defender-business/
6060
topicHref: /microsoft-365/core/
61-
- name: Microsoft 365
62-
tocHref: /mem/
63-
topicHref: /microsoft-365/index
64-
items:
6561
- name: Microsoft 365 Core
66-
tocHref: /mem/autopilot/
62+
tocHref: /autopilot/
6763
topicHref: /microsoft-365/core/
6864
- name: Microsoft 365
6965
tocHref: /windows/

microsoft-365/enterprise/configure-exchange-server-for-hybrid-modern-authentication.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ms.custom:
2424
- seo-marvel-apr2020
2525
- has-azure-ad-ps-ref
2626
- azure-ad-ref-level-one-done
27+
- identity-models
2728
---
2829

2930
# How to configure Exchange Server on-premises to use Hybrid Modern Authentication

microsoft-365/enterprise/hybrid-modern-auth-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ ms.collection:
1717
- must-keep
1818
f1.keywords:
1919
- NOCSH
20-
ms.custom: seo-marvel-apr2020
20+
ms.custom:
21+
- seo-marvel-apr2020
22+
- identity-models
2123
description: "In this article, you can learn about Hybrid Modern Authentication and the prerequisites for use with on-premises Skype for Business and Exchange servers."
2224
---
2325

microsoft-365/enterprise/manage-microsoft-365-groups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ f1.keywords:
1414
ms.custom:
1515
- Adm_O365
1616
- seo-marvel-mar2020
17+
- user-accounts
1718
ms.collection:
1819
- scotvorg
1920
- Ent_O365

microsoft-365/enterprise/manage-microsoft-365-identity-governance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ f1.keywords:
1414
ms.custom:
1515
- Adm_O365
1616
- seo-marvel-mar2020
17+
- user-accounts
1718
ms.collection:
1819
- scotvorg
1920
- Ent_O365

microsoft-365/enterprise/manage-microsoft-365-passwords.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ f1.keywords:
1414
ms.custom:
1515
- Adm_O365
1616
- seo-marvel-mar2020
17+
- user-accounts
1718
ms.collection:
1819
- scotvorg
1920
- Ent_O365
@@ -34,7 +35,7 @@ description: "Learn about how to manage Microsoft 365 user account passwords."
3435

3536
You can manage Microsoft 365 user account passwords in several different ways, depending on your identity configuration. You can manage user accounts in the [Microsoft 365 admin center](/admin), in Active Directory Domain Services (AD DS), or in the Microsoft Entra admin center.
3637

37-
## Plan for where and how you will manage your user account passwords
38+
## Plan for where and how you manage your user account passwords
3839

3940
Where and how you can manage your user accounts depends on the identity model you want to use for your Microsoft 365. The two models are cloud-only and hybrid.
4041

@@ -55,7 +56,7 @@ With [password writeback](#pw_writeback), your users can change their AD DS pass
5556

5657
All your users should be using [Microsoft's password guidance](https://www.microsoft.com/research/publication/password-guidance) to create their user account passwords.
5758

58-
To prevent users from creating an easily-determined password, use Microsoft Entra password protection, which uses both a global banned password list and an optional custom banned password list that you specify. For example, you can specify terms that are specific to your organization, such as:
59+
To prevent users from creating an easily determined password, use Microsoft Entra password protection, which uses both a global banned password list and an optional custom banned password list that you specify. For example, you can specify terms that are specific to your organization, such as:
5960

6061
- Brand names
6162
- Product names
@@ -67,21 +68,21 @@ You can ban bad passwords [in the cloud](/azure/active-directory/authentication/
6768

6869
## Simplify user sign-in
6970

70-
Microsoft Entra seamless single sign-on (Microsoft Entra seamless SSO) works with PHS and Pass-Through Authentication (PTA), to allow your users to sign in to services that use Microsoft Entra user accounts without having to type in their passwords, and in many cases, their usernames. This gives your users easier access to cloud-based applications, such as Office 365, without needing any additional on-premises components such as identity federation servers.
71+
Microsoft Entra seamless single sign-on (Microsoft Entra seamless SSO) works with PHS and Pass-Through Authentication (PTA), to allow your users to sign in to services that use Microsoft Entra user accounts without having to type in their passwords, and in many cases, their usernames. This gives your users easier access to cloud-based applications, such as Office 365, without needing any further on-premises components such as identity federation servers.
7172

7273
You configure Microsoft Entra seamless SSO with the Microsoft Entra Connect tool. See the [instructions to configure Microsoft Entra seamless SSO](/azure/active-directory/connect/active-directory-aadconnect-sso-quick-start).
7374

7475
<a name="pw_writeback"></a>
7576
## Simplify password updates to AD DS
7677

77-
With password writeback, you can allow users to reset their passwords through Microsoft Entra ID, which is then replicated to AD DS. Users don’t need to access their on-premises AD DS to update their passwords. This is valuable to roaming or remote users who do not have a remote access connection to the on-premises network.
78+
With password writeback, you can allow users to reset their passwords through Microsoft Entra ID, which is then replicated to AD DS. Users don’t need to access their on-premises AD DS to update their passwords. This is valuable to roaming or remote users who don't have a remote access connection to the on-premises network.
7879

7980
Password writeback is required to fully utilize Microsoft Entra ID Protection capabilities, such as requiring users to change their on-premises passwords when there has been a high risk of account compromise detected.
8081

81-
For additional information and configuration instructions, see [Microsoft Entra SSPR with password writeback](/azure/active-directory/active-directory-passwords-writeback).
82+
For more information and configuration instructions, see [Microsoft Entra SSPR with password writeback](/azure/active-directory/active-directory-passwords-writeback).
8283

8384
> [!NOTE]
84-
> Upgrade to the latest version of Microsoft Entra Connect to ensure the best possible experience and new features as they are released. For more information, see [Custom installation of Microsoft Entra Connect](/azure/active-directory/connect/active-directory-aadconnect-get-started-custom).
85+
> Upgrade to the latest version of Microsoft Entra Connect to ensure the best possible experience and new features as they're released. For more information, see [Custom installation of Microsoft Entra Connect](/azure/active-directory/connect/active-directory-aadconnect-get-started-custom).
8586
>
8687
8788
## Simplify password resets

microsoft-365/enterprise/modern-auth-for-office-2013-and-2016.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ms.localizationpriority: medium
1111
ms.custom:
1212
- Adm_O365
1313
- seo-marvel-apr2020
14+
- identity-models
1415
ms.assetid: e4c45989-4b1a-462e-a81b-2a13191cf517
1516
ms.collection:
1617
- scotvorg

microsoft-365/enterprise/remove-or-disable-hybrid-modern-authentication-from-skype-for-business-and-excha.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ f1.keywords:
2020
- NOCSH
2121
ms.custom:
2222
- seo-marvel-apr2020
23+
- identity-models
2324
description: "This article explains how to remove or disable Hybrid Modern Authentication from Skype for Business and Exchange."
2425
---
2526

0 commit comments

Comments
 (0)