Skip to content

Commit 93c8a09

Browse files
chrfoxchrfox
authored
Merge branch 'main' into patch-17
2 parents 715c46b + 69ee902 commit 93c8a09

621 files changed

Lines changed: 8131 additions & 7053 deletions

File tree

Some content is hidden

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

‎.acrolinx-config.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{:allowed-branchname-matches ["master" "main"]
1+
{:allowed-branchname-matches ["main"]
22
:allowed-filename-matches ["microsoft-365/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
33

44
:use-gh-statuses true

‎.openpublishing.publish.config.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"locale": "en-us",
88
"monikers": [],
99
"moniker_ranges": [
10-
"o365-21vianet", "o365-worldwide"
10+
"o365-21vianet",
11+
"o365-worldwide"
1112
],
1213
"open_to_public_contributors": true,
1314
"type_mapping": {
@@ -32,13 +33,13 @@
3233
{
3334
"path_to_root": "_themes",
3435
"url": "https://github.com/Microsoft/templates.docs.msft",
35-
"branch": "master",
36+
"branch": "main",
3637
"branch_mapping": {}
3738
},
3839
{
3940
"path_to_root": "_themes.pdf",
4041
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
41-
"branch": "master",
42+
"branch": "main",
4243
"branch_mapping": {}
4344
}
4445
],
@@ -47,7 +48,7 @@
4748
"Publish",
4849
"Pdf"
4950
],
50-
"master": [
51+
"main": [
5152
"Publish",
5253
"Pdf"
5354
],
@@ -66,4 +67,4 @@
6667
"docs_build_engine": {
6768
"name": "docfx_v3"
6869
}
69-
}
70+
}

‎.openpublishing.redirection.json‎

Lines changed: 259 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/microsoftteams/guest-experience",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path": "microsoft-365/admin/manage/servicenow-service-health-incidents-solutions-only.md",
15+
"redirect_url": "/microsoft-365/admin/manage/servicenow-overview",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path": "microsoft-365/business-video/work-from-anywhere.md",
1520
"redirect_url": "https://support.microsoft.com/en-us/office/work-remotely-with-microsoft-365-164946c8-a47a-470e-a0b4-feb12a2eea04",
@@ -50,6 +55,41 @@
5055
"redirect_url": "https://support.microsoft.com/office/3f73d218-52d6-4f88-a733-9ff37073ee4c",
5156
"redirect_document_id": false
5257
},
58+
{
59+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/add-google-domain.md",
60+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/add-google-domain",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/cancel-google.md",
65+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/cancel-google",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/connect-domain-tom365.md",
70+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/connect-domain-tom365",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/migrate-email.md",
75+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/migrate-email",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/move-from-google-workspace-overview.md",
80+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/move-from-google-workspace-overview",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/mover-migrate-files.md",
85+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/mover-migrate-files",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "microsoft-365/business-video/moveto-microsoft-365/set-up-microsoft-365-forgoogle.md",
90+
"redirect_url": "/microsoft-365/admin/moveto-microsoft-365/set-up-microsoft-365-forgoogle",
91+
"redirect_document_id": false
92+
},
5393
{
5494
"source_path": "microsoft-365/business-video/shared-calendar.md",
5595
"redirect_url": "https://support.microsoft.com/office/353ed2c1-3ec5-449d-8c73-6931a0adab88",
@@ -4904,6 +4944,41 @@
49044944
"redirect_url": "/microsoft-365/compliance/inactive-mailboxes-in-office-365",
49054945
"redirect_document_id": false
49064946
},
4947+
{
4948+
"source_path": "microsoft-365/compliance/create-search-to-collect-data.md",
4949+
"redirect_url": "/microsoft-365/compliance/create-draft-collection",
4950+
"redirect_document_id": false
4951+
},
4952+
{
4953+
"source_path": "microsoft-365/compliance/create-tag-groups.md",
4954+
"redirect_url": "/microsoft-365/compliance/tagging-documents",
4955+
"redirect_document_id": false
4956+
},
4957+
{
4958+
"source_path": "microsoft-365/compliance/annotating-and-redacting-documents.md",
4959+
"redirect_url": "/microsoft-365/compliance/view-documents-in-review-set",
4960+
"redirect_document_id": false
4961+
},
4962+
{
4963+
"source_path": "microsoft-365/compliance/tagging-and-assessment-in-advanced-ediscovery.md",
4964+
"redirect_url": "/microsoft-365/compliance/predictive-coding-overview",
4965+
"redirect_document_id": false
4966+
},
4967+
{
4968+
"source_path": "microsoft-365/compliance/search-statistics-in-advanced-ediscovery.md",
4969+
"redirect_url": "/microsoft-365/compliance/collection-statistics-reports",
4970+
"redirect_document_id": false
4971+
},
4972+
{
4973+
"source_path": "microsoft-365/compliance/relevance-module-retirement.md",
4974+
"redirect_url": "/microsoft-365/compliance/predictive-coding-overview",
4975+
"redirect_document_id": false
4976+
},
4977+
{
4978+
"source_path": "microsoft-365/compliance/reviewing-data-in-review-set.md",
4979+
"redirect_url": "/microsoft-365/compliance/review-set-search",
4980+
"redirect_document_id": false
4981+
},
49074982
{
49084983
"source_path": "microsoft-365/security/defender-endpoint/overview-hardware-based-isolation.md",
49094984
"redirect_url": "/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows",
@@ -5939,6 +6014,26 @@
59396014
"redirect_url": "/microsoft-365/security/defender-endpoint/manage-mde-post-migration-other-tools",
59406015
"redirect_document_id": true
59416016
},
6017+
{
6018+
"source_path": "microsoft-365/security/defender-endpoint/portal-overview.md",
6019+
"redirect_url": "/microsoft-365/security/defender/microsoft-365-security-center-mde",
6020+
"redirect_document_id": false
6021+
},
6022+
{
6023+
"source_path": "microsoft-365/security/defender-endpoint/manage-edr.md",
6024+
"redirect_url": "/microsoft-365/security/defender-endpoint/overview-endpoint-detection-response",
6025+
"redirect_document_id": false
6026+
},
6027+
{
6028+
"source_path": "microsoft-365/security/defender-endpoint/microsoft-defender-security-center.md",
6029+
"redirect_url": "/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint",
6030+
"redirect_document_id": false
6031+
},
6032+
{
6033+
"source_path": "microsoft-365/security/defender-endpoint/service-status.md",
6034+
"redirect_url": "/microsoft-365/enterprise/view-service-health",
6035+
"redirect_document_id": false
6036+
},
59426037
{
59436038
"source_path": "microsoft-365/learning/configure-cornerstone-content-source.md",
59446039
"redirect_url": "/viva/learning/configure-cornerstone-content-source",
@@ -6429,10 +6524,174 @@
64296524
"redirect_url": "/microsoft-365/security/defender-business/mdb-view-edit-create-policies",
64306525
"redirect_document_id": true
64316526
},
6527+
{
6528+
"source_path": "microsoft-365/enterprise/about-microsoft-365-identity.md",
6529+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-identity-model",
6530+
"redirect_document_id": true
6531+
},
6532+
{
6533+
"source_path": "microsoft-365/enterprise/identity-roadmap-microsoft-365.md",
6534+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-overview",
6535+
"redirect_document_id": true
6536+
},
6537+
{
6538+
"source_path": "microsoft-365/enterprise/plan-for-directory-synchronization.md",
6539+
"redirect_url": "/microsoft-365/enterprise/prepare-for-directory-synchronization",
6540+
"redirect_document_id": true
6541+
},
64326542
{
64336543
"source_path": "microsoft-365/security/defender-business/mdb-create-new-policy.md",
64346544
"redirect_url": "/microsoft-365/security/defender-business/mdb-view-edit-create-policies",
64356545
"redirect_document_id": false
6546+
},
6547+
{
6548+
"source_path": "microsoft-365/security/defender/m365d-whats-new.md",
6549+
"redirect_url": "/microsoft-365/security/defender/whats-new?view=o365-worldwide",
6550+
},
6551+
{
6552+
"source_path": "microsoft-365/security/defender-endpoint/old-index.md",
6553+
"redirect_url": "/microsoft-365/security/defender-endpoint/?view=o365-worldwide",
6554+
"redirect_document_id": false
6555+
},
6556+
{
6557+
"source_path": "microsoft-365/enterprise/microsoft-365-client-support-certificate-based-authentication.md",
6558+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-overview",
6559+
"redirect_document_id": false
6560+
},
6561+
{
6562+
"source_path": "microsoft-365/enterprise/microsoft-365-client-support-conditional-access.md",
6563+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-overview",
6564+
"redirect_document_id": false
6565+
},
6566+
{
6567+
"source_path": "microsoft-365/enterprise/microsoft-365-client-support-multi-factor-authentication.md",
6568+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-overview",
6569+
"redirect_document_id": false
6570+
},
6571+
{
6572+
"source_path": "microsoft-365/enterprise/microsoft-365-client-support-single-sign-on.md",
6573+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-overview",
6574+
"redirect_document_id": false
6575+
},
6576+
{
6577+
"source_path": "microsoft-365/security/office-365-security/create-team-sites-in-a-political-campaign-dev-test-environment.md",
6578+
"redirect_url": "/microsoft-365/enterprise/m365-enterprise-test-lab-guides",
6579+
"redirect_document_id": false
6580+
},
6581+
{
6582+
"source_path": "microsoft-365/security/office-365-security/configure-groups-and-users-for-a-political-campaign-dev-test-environment.md",
6583+
"redirect_url": "/microsoft-365/enterprise/m365-enterprise-test-lab-guides",
6584+
"redirect_document_id": false
6585+
},
6586+
{
6587+
"source_path": "microsoft-365/enterprise/microsoft-365-client-services-app-support.md",
6588+
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-overview",
6589+
"redirect_document_id": false
6590+
},
6591+
{
6592+
"source_path": "microsoft-365/campaigns/create-communications-site.md",
6593+
"redirect_url": "/microsoft-365/business-premium/create-communications-site",
6594+
"redirect_document_id": true
6595+
},
6596+
{
6597+
"source_path": "microsoft-365/campaigns/create-teams-for-collaboration.md",
6598+
"redirect_url": "/microsoft-365/business-premium/create-teams-for-collaboration",
6599+
"redirect_document_id": true
6600+
},
6601+
{
6602+
"source_path": "microsoft-365/campaigns/get-microsoft-365-campaigns.md",
6603+
"redirect_url": "/microsoft-365/business-premium/get-microsoft-365-campaigns",
6604+
"redirect_document_id": true
6605+
},
6606+
{
6607+
"source_path": "microsoft-365/campaigns/index.md",
6608+
"redirect_url": "/microsoft-365/business-premium/index",
6609+
"redirect_document_id": true
6610+
},
6611+
{
6612+
"source_path": "microsoft-365/campaigns/m365-campaigns-conditional-access.md",
6613+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-conditional-access",
6614+
"redirect_document_id": true
6615+
},
6616+
{
6617+
"source_path": "microsoft-365/campaigns/m365-campaigns-increase-protection.md",
6618+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-increase-protection",
6619+
"redirect_document_id": true
6620+
},
6621+
{
6622+
"source_path": "microsoft-365/campaigns/m365-campaigns-multifactor-authenication.md",
6623+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-multifactor-authentication",
6624+
"redirect_document_id": true
6625+
},
6626+
{
6627+
"source_path": "microsoft-365/campaigns/m365-campaigns-phishing-and-attacks.md",
6628+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-phishing-and-attacks",
6629+
"redirect_document_id": true
6630+
},
6631+
{
6632+
"source_path": "microsoft-365/campaigns/m365-campaigns-protect-admin-accounts.md",
6633+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-protect-admin-accounts",
6634+
"redirect_document_id": true
6635+
},
6636+
{
6637+
"source_path": "microsoft-365/campaigns/m365-campaigns-protect-campaign-infographic.md",
6638+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-protect-campaign-infographic",
6639+
"redirect_document_id": true
6640+
},
6641+
{
6642+
"source_path": "microsoft-365/campaigns/m365-campaigns-protect-pcs-macs.md",
6643+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-protect-pcs-macs",
6644+
"redirect_document_id": true
6645+
},
6646+
{
6647+
"source_path": "microsoft-365/campaigns/m365-campaigns-security-overview.md",
6648+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-security-overview",
6649+
"redirect_document_id": true
6650+
},
6651+
{
6652+
"source_path": "microsoft-365/campaigns/m365-campaigns-sign-in.md",
6653+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-sign-in",
6654+
"redirect_document_id": true
6655+
},
6656+
{
6657+
"source_path": "microsoft-365/campaigns/m365-campaigns-sign-up.md",
6658+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-sign-up",
6659+
"redirect_document_id": true
6660+
},
6661+
{
6662+
"source_path": "microsoft-365/campaigns/m365-campaigns-users.md",
6663+
"redirect_url": "/microsoft-365/business-premium/m365-campaigns-users",
6664+
"redirect_document_id": true
6665+
},
6666+
{
6667+
"source_path": "microsoft-365/campaigns/m365-customize-sign-in.md",
6668+
"redirect_url": "/microsoft-365/business-premium/m365-customize-sign-in",
6669+
"redirect_document_id": true
6670+
},
6671+
{
6672+
"source_path": "microsoft-365/campaigns/microsoft-365-campaigns-setup-overview.md",
6673+
"redirect_url": "/microsoft-365/business-premium/microsoft-365-campaigns-setup-overview",
6674+
"redirect_document_id": true
6675+
},
6676+
{
6677+
"source_path": "microsoft-365/campaigns/send-encrypted-email.md",
6678+
"redirect_url": "/microsoft-365/business-premium/send-encrypted-email",
6679+
"redirect_document_id": true
6680+
},
6681+
{
6682+
"source_path": "microsoft-365/campaigns/set-up-meetings.md",
6683+
"redirect_url": "/microsoft-365/business-premium/set-up-meetings",
6684+
"redirect_document_id": true
6685+
},
6686+
{
6687+
"source_path": "microsoft-365/campaigns/share-files-and-videos.md",
6688+
"redirect_url": "/microsoft-365/business-premium/share-files-and-videos",
6689+
"redirect_document_id": true
6690+
},
6691+
{
6692+
"source_path": "microsoft-365/compliance/what-the-dlp-functions-look-for.md",
6693+
"redirect_url": "/microsoft-365/compliance/sit-functions",
6694+
"redirect_document_id": false
64366695
}
64376696
]
64386697
}

‎microsoft-365/admin/TOC.yml‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@
145145
href: add-users/remove-former-employee-step-1.md
146146
- name: Step 2. Save the contents of a former employee's mailbox
147147
href: add-users/remove-former-employee-step-2.md
148-
- name: Step 3. Forward a former employee's email to another employee or convert to a shared mailbox
148+
- name: Step 3. Wipe and block a former employee's mobile device
149149
href: add-users/remove-former-employee-step-3.md
150-
- name: Step 4. Give another employee access to OneDrive and Outlook data
150+
- name: Step 4. Forward a former employee's email to another employee or convert to a shared mailbox
151151
href: add-users/remove-former-employee-step-4.md
152-
- name: Step 5. Wipe and block a former employee's mobile device
152+
- name: Step 5. Give another employee access to OneDrive and Outlook data
153153
href: add-users/remove-former-employee-step-5.md
154154
- name: Step 6. Remove the Microsoft 365 license from a former employee
155155
href: add-users/remove-former-employee-step-6.md
@@ -328,8 +328,6 @@
328328
href: manage/servicenow-basic-authentication.md
329329
- name: Configure with Azure AD Auth Token
330330
href: manage/servicenow-aad-oauth-token.md
331-
- name: Service health incidents and recommended solutions only
332-
href: manage/servicenow-service-health-incidents-solutions-only.md
333331
- name: Testing the configuration
334332
href: manage/servicenow-testing-the-configuration.md
335333
- name: Troubleshooting
@@ -436,6 +434,28 @@
436434
href: basic-mobility-security/turn-off.md
437435
- name: Troubleshoot
438436
href: basic-mobility-security/troubleshoot.md
437+
- name: Switch from Google Workspace to M365
438+
items:
439+
- name: Overview
440+
href: moveto-microsoft-365/move-from-google-workspace-overview.md
441+
- name: Sign up for Microsoft 365
442+
href: admin-overview/sign-up-for-office-365.md?toc=/microsoft-365/admin/moveto-microsoft-365/toc.json&bc=/microsoft-365/admin/moveto-microsoft-365/breadcrumb/toc.json
443+
- name: Set up Microsoft 365 for Google migration
444+
href: moveto-microsoft-365/set-up-microsoft-365-forgoogle.md
445+
- name: Set up security policies for Windows devices
446+
href: setup/secure-win-10-pcs.md?toc=/microsoft-365/admin/moveto-microsoft-365/toc.json&bc=/microsoft-365/admin/moveto-microsoft-365/breadcrumb/toc.json
447+
- name: Add Google Workspace Domain
448+
href: moveto-microsoft-365/add-google-domain.md
449+
- name: Install Office apps and Microsoft Teams
450+
href: setup/install-applications.md?toc=/microsoft-365/admin/moveto-microsoft-365/toc.json&bc=/microsoft-365/admin/moveto-microsoft-365/breadcrumb/toc.json
451+
- name: Migrate email, calendar, and contacts to Microsoft 365
452+
href: moveto-microsoft-365/migrate-email.md
453+
- name: Connect your domain to Microsoft 365
454+
href: moveto-microsoft-365/connect-domain-tom365.md
455+
- name: Use Migration Manager to move everyone's data
456+
href: moveto-microsoft-365/migrate-files-migration-manager.md
457+
- name: Cancel Google Workspace
458+
href: moveto-microsoft-365/cancel-google.md
439459
- name: Work with customers
440460
items:
441461
- name: Share sites and files with guest users

0 commit comments

Comments
 (0)