Skip to content

Commit 2578a2d

Browse files
denisebmsftdenisebmsft
authored
Merge branch 'main' into defender-criteria
2 parents d7f3b66 + 7daf717 commit 2578a2d

File tree

683 files changed

+19202
-8769
lines changed

Some content is hidden

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

683 files changed

+19202
-8769
lines changed

‎.acrolinx-config.edn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{:changed-files-limit 30
1+
{:changed-files-limit 60
22
:allowed-branchname-matches ["main" "release-.*"]
3-
:allowed-filename-matches ["defender-xdr/" "exposure-management/" "defender/" "defender-business/" "defender-vulnerability-management/" "defender-office-365/" "defender-endpoint/"] ;; 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"]
3+
:allowed-filename-matches ["defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/"] ;; 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"]
44

55
:use-gh-statuses true
66

‎.openpublishing.publish.config.json‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,30 @@
3737
},
3838
"build_entry_point": "docs"
3939
},
40+
{
41+
"docset_name": "defender-for-cloud",
42+
"build_source_folder": "defender-for-cloud",
43+
"build_output_subfolder": "defender-for-cloud",
44+
"locale": "en-us",
45+
"monikers": [],
46+
"open_to_public_contributors": true,
47+
"type_mapping": {
48+
"Conceptual": "Content"
49+
},
50+
"build_entry_point": "docs"
51+
},
52+
{
53+
"docset_name": "defender-for-iot",
54+
"build_source_folder": "defender-for-iot",
55+
"build_output_subfolder": "defender-for-iot",
56+
"locale": "en-us",
57+
"monikers": [],
58+
"open_to_public_contributors": true,
59+
"type_mapping": {
60+
"Conceptual": "Content"
61+
},
62+
"build_entry_point": "docs"
63+
},
4064
{
4165
"docset_name": "defender-office-365",
4266
"build_source_folder": "defender-office-365",
@@ -115,6 +139,5 @@
115139
"redirection_files": [
116140
".openpublishing.redirection.defender.json",
117141
".openpublishing.redirection.endpoint.json"
118-
119142
]
120143
}

‎.openpublishing.redirection.defender.json‎

Lines changed: 173 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,199 @@
11
{
2-
"redirections": [
2+
"redirections": [
33
{
4-
"source_path": "defender/advanced-hunting-overview.md",
5-
"redirect_url": "/defender-xdr/advanced-hunting-overview",
6-
"redirect_document_id": false
4+
"source_path": "defender/advanced-hunting-overview.md",
5+
"redirect_url": "/defender-xdr/advanced-hunting-overview",
6+
"redirect_document_id": false
77
},
88
{
99
"source_path": "defender-office-365/zero-trust-continuous-access-evaluation-microsoft-365.md",
1010
"redirect_url": "/security/zero-trust/zero-trust-continuous-access-evaluation-microsoft-365",
1111
"redirect_document_id": false
12-
},
13-
{
14-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-common.md",
15-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-common",
16-
"redirect_document_id": false
17-
},
18-
{
19-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-exchange.md",
20-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-exchange",
21-
"redirect_document_id": false
22-
},
23-
{
24-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-guest-access.md",
25-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-guest-access",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-mcas-saas.md",
30-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-mcas-saas",
31-
"redirect_document_id": false
32-
},
33-
{
34-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-overview.md",
35-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-overview",
36-
"redirect_document_id": false
37-
},
38-
{
39-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-prereq.md",
40-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-prerequisite",
41-
"redirect_document_id": false
42-
},
43-
{
44-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-sharepoint.md",
45-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-sharepoint",
46-
"redirect_document_id": false
47-
},
48-
{
49-
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-teams.md",
50-
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-teams",
51-
"redirect_document_id": false
52-
},
53-
{
12+
},
13+
{
14+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-common.md",
15+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-common",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-exchange.md",
20+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-exchange",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-guest-access.md",
25+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-guest-access",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-mcas-saas.md",
30+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-mcas-saas",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-overview.md",
35+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-overview",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-prereq.md",
40+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-prerequisite",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-sharepoint.md",
45+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-sharepoint",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "defender-office-365/zero-trust-identity-device-access-policies-teams.md",
50+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-teams",
51+
"redirect_document_id": false
52+
},
53+
{
5454
"source_path": "defender-endpoint/microsoft-defender-antivirus-using-mde-security-set-mngmnt.md",
5555
"redirect_url": "/defender-endpoint/evaluate-mdav-using-gp",
5656
"redirect_document_id": false
5757
},
58-
{
59-
"source_path": "defender-endpoint/preview.md",
60-
"redirect_url": "/defender-xdr/preview",
58+
{
59+
"source_path": "defender-endpoint/preview.md",
60+
"redirect_url": "/defender-xdr/preview",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "defender-endpoint/preview-settings.md",
65+
"redirect_url": "/defender-xdr/preview",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "defender-business/mdb-preview.md",
70+
"redirect_url": "/defender-xdr/preview",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "defender-xdr/eval-create-eval-environment.md",
75+
"redirect_url": "/defender-xdr/pilot-deploy-overview",
6176
"redirect_document_id": false
6277
},
6378
{
64-
"source_path": "defender-endpoint/preview-settings.md",
65-
"redirect_url": "/defender-xdr/preview",
79+
"source_path": "defender-xdr/eval-overview.md",
80+
"redirect_url": "/defender-xdr/pilot-deploy-overview",
6681
"redirect_document_id": false
6782
},
6883
{
69-
"source_path": "defender-business/mdb-preview.md",
70-
"redirect_url": "/defender-xdr/preview",
84+
"source_path": "defender-xdr/eval-defender-endpoint-architecture.md",
85+
"redirect_url": "/defender-xdr/pilot-deploy-defender-endpoint",
7186
"redirect_document_id": false
7287
},
88+
{
89+
"source_path": "defender-xdr/eval-defender-endpoint-enable-eval.md",
90+
"redirect_url": "/defender-xdr/pilot-deploy-defender-endpoint",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "defender-xdr/eval-defender-endpoint-overview.md",
95+
"redirect_url": "/defender-xdr/pilot-deploy-defender-endpoint",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "defender-xdr/eval-defender-endpoint-pilot.md",
100+
"redirect_url": "/defender-xdr/pilot-deploy-defender-endpoint",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "defender-xdr/eval-defender-identity-architecture.md",
105+
"redirect_url": "/defender-xdr/pilot-deploy-defender-identity",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "defender-xdr/eval-defender-identity-enable-eval.md",
110+
"redirect_url": "/defender-xdr/pilot-deploy-defender-identity",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "defender-xdr/eval-defender-identity-overview.md",
115+
"redirect_url": "/defender-xdr/pilot-deploy-defender-identity",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path": "defender-xdr/eval-defender-identity-pilot.md",
120+
"redirect_url": "/defender-xdr/pilot-deploy-defender-identity",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path": "defender-xdr/eval-defender-investigate-respond-additional.md",
125+
"redirect_url": "/defender-xdr/pilot-deploy-investigate-respond",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path": "defender-xdr/eval-defender-mcas-architecture.md",
130+
"redirect_url": "/defender-xdr/pilot-deploy-defender-cloud-apps",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path": "defender-xdr/eval-defender-mcas-enable-eval.md",
135+
"redirect_url": "/defender-xdr/pilot-deploy-defender-cloud-apps",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "defender-xdr/eval-defender-mcas-overview.md",
140+
"redirect_url": "/defender-xdr/pilot-deploy-defender-cloud-apps",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "defender-xdr/eval-defender-mcas-pilot.md",
145+
"redirect_url": "/defender-xdr/pilot-deploy-defender-cloud-apps",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "defender-xdr/eval-defender-office-365-architecture.md",
150+
"redirect_url": "/defender-xdr/pilot-deploy-defender-office-365",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "defender-xdr/eval-defender-office-365-enable-eval.md",
155+
"redirect_url": "/defender-xdr/pilot-deploy-defender-office-365",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "defender-xdr/eval-defender-office-365-overview.md",
160+
"redirect_url": "/defender-xdr/pilot-deploy-defender-office-365",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "defender-xdr/eval-defender-office-365-pilot.md",
165+
"redirect_url": "/defender-xdr/pilot-deploy-defender-office-365",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "defender-xdr/eval-defender-investigate-respond-simulate-attack.md",
170+
"redirect_url": "/defender-xdr/pilot-deploy-investigate-respond",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path": "defender-xdr/eval-defender-investigate-respond.md",
175+
"redirect_url": "/defender-xdr/pilot-deploy-investigate-respond",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path": "defender-xdr/eval-defender-promote-to-production.md",
180+
"redirect_url": "/defender-xdr/pilot-deploy-overview",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path": "defender-xdr/microsoft-365-security-mde-redirection.md",
185+
"redirect_url": "/defender-xdr/",
186+
"redirect_document_id": false
187+
},
73188
{
74189
"source_path": "defender-endpoint/evaluation-lab.md",
75190
"redirect_url": "/defender-endpoint/evaluate-microsoft-defender-antivirus",
76191
"redirect_document_id": true
192+
},
193+
{
194+
"source_path": "defender-endpoint/collect-diagnostic-data-update-compliance.md",
195+
"redirect_url": "/defender-endpoint/collect-diagnostic-data",
196+
"redirect_document_id": false
77197
}
78198
]
79199
}

‎defender-business/TOC.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
href: trial-playbook-defender-business.md
2626
- name: Visit the Microsoft Defender portal
2727
href: mdb-get-started.md
28-
- name: Try tutorials and simulations
28+
- name: Find training and learning resources
2929
href: mdb-tutorials.md
3030
- name: Set up and configure Defender for Business
3131
items:
@@ -90,19 +90,21 @@
9090
- name: Understand policy order
9191
href: mdb-policy-order.md
9292
- name: Maintain your environment
93-
href: /Microsoft-365/business-premium/m365bp-mdb-maintain-environment?bc=%2Fmicrosoft-365%2Fsecurity%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fmicrosoft-365%2Fsecurity%2Fdefender-business%2Ftoc.json
93+
href: /Microsoft-365/business-premium/m365bp-mdb-maintain-environment?bc=%2defender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fdefender-business%2Ftoc.json
9494
- name: Reference information
9595
items:
96+
- name: Security, privacy, and compliance
97+
href: mdb-security-privacy-compliance.md
9698
- name: Top 10 ways to secure your business data
97-
href: /Microsoft-365/business-premium/secure-your-business-data?bc=%2Fmicrosoft-365%2Fsecurity%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fmicrosoft-365%2Fsecurity%2Fdefender-business%2Ftoc.json
99+
href: /Microsoft-365/business-premium/secure-your-business-data?bc=%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fdefender-business%2Ftoc.json
98100
- name: How to get help or contact support
99-
href: /microsoft-365/admin/get-help-support.md
101+
href: /microsoft-365/admin/get-help-support
100102
- name: Frequently asked questions
101103
href: mdb-faq.yml
102104
- name: Troubleshooting
103105
href: mdb-troubleshooting.yml
104106
- name: API reference information
105-
href: /defender-endpoint/api/exposed-apis-create-app-partners?bc=%2Fmicrosoft-365%2Fsecurity%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fmicrosoft-365%2Fsecurity%2Fdefender-business%2Ftoc.json
107+
href: /defender-endpoint/api/exposed-apis-create-app-partners?bc=%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fsecurity%2Fdefender-business%2Ftoc.json
106108
- name: Microsoft 365 Business Premium
107109
href: /microsoft-365/business-premium/
108110
- name: Microsoft 365 Lighthouse

0 commit comments

Comments
 (0)