Skip to content

Commit 42b8f98

Browse files
authored
Merge branch 'main' into EE_genUp
2 parents 14c03f4 + dc12a1f commit 42b8f98

3 files changed

Lines changed: 107 additions & 43 deletions

File tree

microsoft-365/backup/backup-setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ description: Learn how to turn on Microsoft 365 Backup, set up pay-as-you-go bil
1919
# Set up Microsoft 365 Backup
2020

2121
> [!TIP]
22-
> **Already have an Azure subscription and are a SharePoint Administrator or Global Administrator?** Follow these three steps to quickly set up Microsoft 365 Backup in the admin center.<br><br>
23-
> [1. Set up pay-as-you-go billing](https://admin.microsoft.com/#/orgsettings/payasyougo)<br>
22+
> **Already have an Azure subscription and are a SharePoint Administrator or Global Administrator?** Follow these steps to quickly set up Microsoft 365 Backup in the admin center.<br><br>
23+
> [1. Set up pay-as-you-go billing](https://admin.microsoft.com/#/PaygPlatform)<br>
2424
> [2. Create backup policies to protect your data](https://admin.microsoft.com/#/Settings/enhancedRestore)<br>
2525
2626

microsoft-365/enterprise/TOC.yml

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ items:
2727
- name: Deploy
2828
items:
2929
- name: Add a domain
30-
href: ../admin/setup/add-domain.md
30+
href: ../admin/setup/add-domain.md?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
3131
- name: Configure endpoints to bypass
3232
items:
3333
- name: Microsoft 365 IP Address and URL Web service
@@ -60,8 +60,8 @@ items:
6060
href: microsoft-365-vpn-stream-and-live-events.md
6161
- name: Microsoft 365 optimization for China users
6262
href: microsoft-365-networking-china.md
63-
- name: Optimizing Microsoft 365 traffic for remote workers with the native Windows 10 VPN client
64-
href: /windows/security/identity-protection/vpn/vpn-office-365-optimization
63+
- name: Optimizing Microsoft 365 traffic for remote workers with the native Windows VPN client
64+
href: /windows/security/operating-system-security/network-security/vpn/vpn-office-365-optimization?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
6565
- name: ExpressRoute for Microsoft 365
6666
href: azure-expressroute.md
6767
items:
@@ -146,20 +146,20 @@ items:
146146
- name: Office 2013, Office 2016, and Office 2019 client apps
147147
href: modern-auth-for-office-2013-and-2016.md
148148
- name: Tenant isolation in Microsoft 365
149-
href: /compliance/assurance/assurance-microsoft-365-isolation-controls
149+
href: /compliance/assurance/assurance-microsoft-365-isolation-controls?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
150150
items:
151151
- name: Isolation and Access Control in Microsoft Entra ID
152152
href: microsoft-365-isolation-in-azure-active-directory.md
153153
- name: Monitoring and Testing Tenant Boundaries
154-
href: /compliance/assurance/assurance-monitoring-and-testing
154+
href: /compliance/assurance/assurance-monitoring-and-testing?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
155155
- name: Resource Limits
156-
href: /compliance/assurance/assurance-resource-limits
156+
href: /compliance/assurance/assurance-resource-limits?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
157157
- name: Isolation and Access Control
158158
href: microsoft-365-isolation-in-microsoft-365.md
159159
- name: Deploy
160160
items:
161161
- name: Add a domain
162-
href: ../admin/setup/add-domain.md
162+
href: ../admin/setup/add-domain.md?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
163163
- name: Manage
164164
items:
165165
- name: Microsoft 365 service health status
@@ -316,7 +316,7 @@ items:
316316
href: configure-multi-geo-in-region-routing.md
317317
displayName: Configure Multi-Geo In-Region Routing
318318
- name: Configure preferred data location
319-
href: /azure/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation?toc=/microsoft-365/Enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
319+
href: /entra/identity/hybrid/connect/how-to-connect-sync-feature-preferreddatalocation?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
320320
- name: Configure search
321321
href: configure-search-for-multi-geo.md
322322
- name: User Testing in Multi-Geo
@@ -387,7 +387,7 @@ items:
387387
- name: Overview
388388
href: hybrid-solutions.md
389389
- name: Use Microsoft Entra ID for SharePoint Server authentication
390-
href: /azure/active-directory/saas-apps/sharepoint-on-premises-tutorial
390+
href: /entra/identity/saas-apps/sharepoint-on-premises-tutorial?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
391391
- name: Connect an on-premises network to an Azure virtual network
392392
href: connect-an-on-premises-network-to-a-microsoft-azure-virtual-network.md
393393
- name: Deploy a directory synchronization server in Azure IaaS
@@ -439,37 +439,35 @@ items:
439439
- name: External collaboration
440440
href: external-guest-access.md
441441
- name: Exchange Online
442-
href: /Exchange/exchange-online
442+
href: /exchange/exchange-online?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
443443
- name: SharePoint
444-
href: /sharepoint/sharepoint-online
444+
href: /sharepoint/introduction?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
445445
- name: Microsoft Teams
446-
href: /MicrosoftTeams/Teams-overview
446+
href: /microsoftteams/teams-overview?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
447447
- name: Meetings and conferencing
448-
href: /microsoftteams/deploy-meetings-microsoft-teams-landing-page
448+
href: /microsoftteams/deploy-meetings-microsoft-teams-landing-page?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
449449
- name: Teams voice
450-
href: /microsoftteams/cloud-voice-landing-page
451-
- name: Yammer
452-
href: https://support.office.com/article/e1464355-1f97-49ac-b2aa-dd320b179dbe
450+
href: /microsoftteams/cloud-voice-landing-page?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
451+
- name: Viva Engage
452+
href: /viva/engage/overview?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
453453
- name: Activate rights management
454454
href: activate-rms-in-microsoft-365.md
455455
- name: Configuring release options
456-
href: https://support.office.com/article/365-3b3adfa4-1777-4ff0-b606-fb8732101f47
457-
- name: Train your users
458-
href: /office365/admin/admin-overview/get-started-with-office-365#training-resources-for-your-users
456+
href: ../admin/manage/release-options-in-office-365.md?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
459457
- name: Manage
460458
items:
461459
- name: How to check service health
462460
href: view-service-health.md
463461
- name: Support options
464-
href: ../admin/get-help-support.md
462+
href: ../admin/get-help-support.md?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
465463
- name: Exchange Online
466-
href: /Exchange/exchange-online
464+
href: /exchange/exchange-online?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
467465
- name: SharePoint
468-
href: /sharepoint/introduction
466+
href: /sharepoint/introduction?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
469467
- name: Microsoft Teams
470-
href: /microsoftteams/manage-teams-overview
471-
- name: Yammer
472-
href: https://support.office.com/article/e1464355-1f97-49ac-b2aa-dd320b179dbe
468+
href: /microsoftteams/manage-teams-overview?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
469+
- name: Viva Engage
470+
href: /viva/engage/overview?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
473471
- name: Performance and tuning
474472
items:
475473
- name: Performance tuning using baselines and performance history
@@ -493,23 +491,23 @@ items:
493491
- name: Windows 11
494492
items:
495493
- name: How to check release health
496-
href: /windows/deployment/update/check-release-health
494+
href: /windows/deployment/update/check-release-health?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
497495
- name: Deploy and update
498-
href: /windows/deployment/
496+
href: /windows/deployment/?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
499497

500498
- name: Microsoft 365 Apps for enterprise
501-
href: /deployoffice/deployment-guide-microsoft-365-apps
499+
href: /microsoft-365-apps/deploy/deployment-guide-microsoft-365-apps?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
502500

503501
- name: Surface devices
504-
href: /surface/deploy
502+
href: /surface/surface-autopilot-cookbook?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
505503

506504
- name: Device management
507505
items:
508506
- name: Roadmap
509507
href: device-management-roadmap-microsoft-365.md
510508

511509
- name: Microsoft Edge
512-
href: /deployedge/deploy-edge-plan-deployment
510+
href: /deployedge/deploy-edge-plan-deployment?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
513511

514512
- name: Deployment and update channel example configurations
515513
href: deploy-update-channels-examples.md
@@ -586,7 +584,7 @@ items:
586584
- name: Manage SharePoint Online site groups
587585
href: manage-sharepoint-site-groups-with-powershell.md
588586
- name: Manage Exchange Online
589-
href: /powershell/exchange/connect-to-exchange-online-powershell
587+
href: /powershell/exchange/connect-to-exchange-online-powershell?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
590588
- name: Use PowerShell to migrate email to Microsoft 365
591589
href: use-powershell-for-email-migration-to-microsoft-365.md
592590
items:
@@ -602,9 +600,9 @@ items:
602600
- name: Add a domain to a client tenancy with Windows PowerShell for Delegated Access partners
603601
href: add-a-domain-to-a-client-tenancy-with-windows-powershell-for-delegated-access-pe.md
604602
- name: Connect to Exchange Online via remote Windows PowerShell for Delegated Access partners
605-
href: /powershell/exchange/connect-to-exchange-online-powershell
603+
href: /powershell/exchange/connect-to-exchange-online-powershell?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
606604
- name: Manage Microsoft Teams
607-
href: /microsoftteams/teams-powershell-install
605+
href: /microsoftteams/teams-powershell-install?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
608606
- name: Manage add-ins with Centralized Deployment PowerShell
609607
href: use-the-centralized-deployment-powershell-cmdlets-to-manage-add-ins.md
610608

@@ -639,16 +637,16 @@ items:
639637
- name: Enterprise Business Continuity Management (EBCM) with cloud services
640638
items:
641639
- name: Customer and cloud partner EBCM responsibilities
642-
href: /compliance/assurance/assurance-customer-and-cloud-partner-ebcm-responsibilities
640+
href: /compliance/assurance/assurance-customer-and-cloud-partner-ebcm-responsibilities?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
643641
- name: Microsoft 365 cloud services resiliency
644-
href: /compliance/assurance/assurance-m365-service-resiliency
642+
href: /compliance/assurance/assurance-m365-service-resiliency?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
645643
- name: Developing your continuity plan
646-
href: /compliance/assurance/assurance-developing-your-ebcm-plan
644+
href: /compliance/assurance/assurance-developing-your-ebcm-plan?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
647645
- name: Service incident mitigation scenarios
648-
href: /compliance/assurance/assurance-microsoft-365-mitigations
646+
href: /compliance/assurance/assurance-microsoft-365-mitigations?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
649647

650648
- name: Navigation guide
651-
href: ../microsoft-365-docs-navigation-guide.md?toc=/microsoft-365/Enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
649+
href: ../microsoft-365-docs-navigation-guide.md?toc=/microsoft-365/enterprise/toc.json&bc=/microsoft-365/enterprise/breadcrumb/toc.json
652650

653651
- name: Microsoft 365 for Business
654652
href: ../admin/index.yml
Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,70 @@
11
items:
2-
- name: Office 365 Enterprise
3-
tocHref: /
4-
topicHref: /microsoft-365/Enterprise/index
2+
- name: Microsoft 365
3+
tocHref: /microsoft-365/
4+
topicHref: /microsoft-365/index
5+
- name: Microsoft 365
6+
tocHref: /windows/
7+
topicHref: /microsoft-365/index
8+
- name: Microsoft 365
9+
tocHref: /entra/
10+
topicHref: /microsoft-365/index
11+
- name: Microsoft 365
12+
tocHref: /compliance/
13+
topicHref: /microsoft-365/index
14+
- name: Microsoft 365
15+
tocHref: /viva/
16+
topicHref: /microsoft-365/index
17+
- name: Microsoft 365
18+
tocHref: /windows/
19+
topicHref: /microsoft-365/index
20+
- name: Microsoft 365
21+
tocHref: /microsoft-365-apps/
22+
topicHref: /microsoft-365/index
23+
- name: Microsoft 365
24+
tocHref: /powershell/
25+
topicHref: /microsoft-365/index
26+
items:
27+
- name: Microsoft 365 for enterprise
28+
tocHref: /microsoft-365/enterprise/index
29+
topicHref: /microsoft-365/enterprise/index
30+
- name: Microsoft 365 for enterprise
31+
tocHref: /microsoft-365/admin/index
32+
topicHref: /microsoft-365/enterprise/index
33+
- name: Microsoft 365 for enterprise
34+
tocHref: /windows/security/
35+
topicHref: /microsoft-365/enterprise/index
36+
- name: Microsoft 365 for enterprise
37+
tocHref: /compliance/assurance/
38+
topicHref: /microsoft-365/enterprise/index
39+
- name: Microsoft 365 for enterprise
40+
tocHref: /entra/identity/
41+
topicHref: /microsoft-365/enterprise/index
42+
- name: Microsoft 365 for enterprise
43+
tocHref: /exchange/
44+
topicHref: /microsoft-365/enterprise/index
45+
- name: Microsoft 365 for enterprise
46+
tocHref: /sharepoint/
47+
topicHref: /microsoft-365/enterprise/index
48+
- name: Microsoft 365 for enterprise
49+
tocHref: /microsoftteams/
50+
topicHref: /microsoft-365/enterprise/index
51+
- name: Microsoft 365 for enterprise
52+
tocHref: /viva/engage/
53+
topicHref: /microsoft-365/enterprise/index
54+
- name: Microsoft 365 for enterprise
55+
tocHref: /windows/deployment/
56+
topicHref: /microsoft-365/enterprise/index
57+
- name: Microsoft 365 for enterprise
58+
tocHref: /microsoft-365-apps/deploy/
59+
topicHref: /microsoft-365/enterprise/index
60+
- name: Microsoft 365 for enterprise
61+
tocHref: /surface/
62+
topicHref: /microsoft-365/enterprise/index
63+
- name: Microsoft 365 for enterprise
64+
tocHref: /deployedge/
65+
topicHref: /microsoft-365/enterprise/index
66+
- name: Microsoft 365 for enterprise
67+
tocHref: /powershell/exchange/
68+
topicHref: /microsoft-365/enterprise/index
69+
70+

0 commit comments

Comments
 (0)