Skip to content

Commit 5df9bd1

Browse files
msbembamsbemba
authored
Merge branch 'public' into patch-1614
2 parents abf7a8a + dd7b4da commit 5df9bd1

798 files changed

Lines changed: 8032 additions & 5944 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,5 +1,5 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
: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"]
2+
:allowed-filename-matches ["microsoft-365/" "copilot/"] ;; 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
55

‎.openpublishing.publish.config.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@
1414
"build_entry_point": "docs",
1515
"template_folder": "_themes"
1616
},
17+
{
18+
"docset_name": "microsoft-365-copilot",
19+
"build_source_folder": "copilot",
20+
"build_output_subfolder": "microsoft-365-copilot",
21+
"locale": "en-us",
22+
"monikers": [],
23+
"moniker_ranges": [],
24+
"open_to_public_contributors": true,
25+
"type_mapping": {
26+
"Conceptual": "Content"
27+
},
28+
"build_entry_point": "docs",
29+
"template_folder": "_themes"
30+
},
1731
{
1832
"docset_name": "Microsoft-365-docs",
1933
"build_source_folder": "microsoft-365",

‎.openpublishing.redirection.admin.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,21 @@
20002000
"source_path": "microsoft-365/admin/security-and-compliance/enable-modern-authentication.md",
20012001
"redirect_url": "/microsoft-365/admin",
20022002
"redirect_document_id":false
2003-
}
2003+
},
2004+
{
2005+
"source_path": "microsoft-365/admin/basic-mobility-security/privacy-and-security.md",
2006+
"redirect_url": "/microsoft-365/admin/basic-mobility-security/overview",
2007+
"redirect_document_id":false
2008+
},
2009+
{
2010+
"source_path": "microsoft-365/admin/misc/deleted-users-checklist.md",
2011+
"redirect_url": "/microsoft-365/admin/add-users/remove-former-employee",
2012+
"redirect_document_id":false
2013+
},
2014+
{
2015+
"source_path": "microsoft-365/admin/misc/message-center-conformance.md",
2016+
"redirect_url": "/microsoft-365/admin/manage/message-center",
2017+
"redirect_document_id":false
2018+
}
20042019
]
20052020
}

‎.openpublishing.redirection.bookings.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path":"microsoft-365/bookings/metrics-and-activity-tracking.md",
1010
"redirect_url":"/microsoft-365/bookings/bookings-overview",
1111
"redirect_document_id":false
12-
}
12+
},
13+
{
14+
"source_path":"microsoft-365/bookings/campaign-id.md",
15+
"redirect_url":"/microsoft-365/bookings/customize-booking-page",
16+
"redirect_document_id":false
17+
}
1318
]
1419
}

‎.openpublishing.redirection.business.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
"source_path": "microsoft-365/business-premium/m365bp-maintain-environment.md",
1515
"redirect_url": "/microsoft-365/business-premium/m365bp-mdb-maintain-environment",
16-
"redirect_document_id": true
16+
"redirect_document_id": false
1717
},
1818
{
1919
"source_path": "microsoft-365/business-premium/m365bp-admin-guide.md",

‎.openpublishing.redirection.compliance.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,17 @@
132132
},
133133
{
134134
"source_path":"microsoft-365/compliance/controlling-your-data-using-customer-key.md",
135-
"redirect_url":"customer-key-overview",
135+
"redirect_url":"/microsoft-365/compliance/customer-key-overview",
136136
"redirect_document_id":true
137137
},
138138
{
139139
"source_path": "microsoft-365/compliance/archive-jive-data.md",
140-
"redirect_url": "compliance/index",
140+
"redirect_url": "/microsoft-365/compliance/index",
141141
"redirect_document_id": false
142142
},
143143
{
144144
"source_path":"microsoft-365/compliance/service-encryption-with-customer-key-faq.md",
145-
"redirect_url":"customer-key-overview",
145+
"redirect_url":"/microsoft-365/compliance/customer-key-overview",
146146
"redirect_document_id":false
147147
},
148148
{
@@ -1182,7 +1182,7 @@
11821182
},
11831183
{
11841184
"source_path": "microsoft-365/compliance/dlp-configure-view-alerts-policies.md",
1185-
"redirect_url": "/purview/dlp-configure-view-alerts-policies",
1185+
"redirect_url": "/purview/dlp-alerts-get-started",
11861186
"redirect_document_id": "FALSE"
11871187
},
11881188
{
@@ -5387,32 +5387,32 @@
53875387
},
53885388
{
53895389
"source_path":"microsoft-365/compliance/dlp-configure-endpoints.md",
5390-
"redirect_url":"microsoft-365/compliance/device-onboarding",
5390+
"redirect_url":"/microsoft-365/compliance/device-onboarding",
53915391
"redirect_document_id":false
53925392
},
53935393
{
53945394
"source_path":"microsoft-365/compliance/dlp-configure-endpoints-gp.md",
5395-
"redirect_url":"microsoft-365/compliance/device-onboarding-gp",
5395+
"redirect_url":"/microsoft-365/compliance/device-onboarding-gp",
53965396
"redirect_document_id":false
53975397
},
53985398
{
53995399
"source_path":"microsoft-365/compliance/dlp-configure-endpoints-mdm.md",
5400-
"redirect_url":"microsoft-365/compliance/device-onboarding-mdm",
5400+
"redirect_url":"/microsoft-365/compliance/device-onboarding-mdm",
54015401
"redirect_document_id":false
54025402
},
54035403
{
54045404
"source_path":"microsoft-365/compliance/dlp-configure-endpoints-sccm.md",
5405-
"redirect_url":"microsoft-365/compliance/device-onboarding-sccm",
5405+
"redirect_url":"/microsoft-365/compliance/device-onboarding-sccm",
54065406
"redirect_document_id":false
54075407
},
54085408
{
54095409
"source_path":"microsoft-365/compliance/dlp-configure-endpoints-script.md",
5410-
"redirect_url":"microsoft-365/compliance/device-onboarding-script",
5410+
"redirect_url":"/microsoft-365/compliance/device-onboarding-script",
54115411
"redirect_document_id":false
54125412
},
54135413
{
54145414
"source_path":"microsoft-365/compliance/dlp-configure-endpoints-vdi.md",
5415-
"redirect_url":"microsoft-365/compliance/device-onboarding-vdi",
5415+
"redirect_url":"/microsoft-365/compliance/device-onboarding-vdi",
54165416
"redirect_document_id":false
54175417
},
54185418
{
@@ -6292,17 +6292,17 @@
62926292
},
62936293
{
62946294
"source_path":"microsoft-365/compliance/create-a-dlp-policy-from-a-template.md",
6295-
"redirect_url":"microsoft-365/compliance/dlp-create-deploy-policy",
6295+
"redirect_url":"/purview/dlp-create-deploy-policy",
62966296
"redirect_document_id":false
62976297
},
62986298
{
62996299
"source_path":"microsoft-365/compliance/create-test-tune-dlp-policy.md",
6300-
"redirect_url":"microsoft-365/compliance/create-deploy-policy",
6300+
"redirect_url":"/purview/dlp-create-deploy-policy",
63016301
"redirect_document_id":false
63026302
},
63036303
{
63046304
"source_path":"microsoft-365/compliance/data-loss-prevention-policies.md",
6305-
"redirect_url":"microsoft-365/compliance/dlp-learn-about-dlp",
6305+
"redirect_url":"/microsoft-365/compliance/dlp-learn-about-dlp",
63066306
"redirect_document_id":false
63076307
},
63086308
{

‎.openpublishing.redirection.enterprise.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,11 @@
10341034
"source_path":"microsoft-365/enterprise/move-sharepoint-between-geo-locations.md",
10351035
"redirect_url":"/microsoft-365/enterprise/m365-dr-workload-spo",
10361036
"redirect_document_id":true
1037+
},
1038+
{
1039+
"source_path":"microsoft-365/enterprise/lang-service-health.md",
1040+
"redirect_url":"/microsoft-365/enterprise/view-service-health",
1041+
"redirect_document_id":true
10371042
}
10381043
]
10391044
}

‎.openpublishing.redirection.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,21 @@
199199
"source_path":"security/defender-endpoint/enable-microsoft-defender-for-iot-integration.md",
200200
"redirect_url":"/azure/defender-for-iot/organizations/concept-enterprise",
201201
"redirect_document_id":false
202+
},
203+
{
204+
"source_path":"microsoft-365/scheduler/index.yml",
205+
"redirect_url":"https://news.microsoft.com/reinventing-productivity",
206+
"redirect_document_id":false
207+
},
208+
{
209+
"source_path":"microsoft-365/admin/copilot/m365-copilot-setup.md",
210+
"redirect_url":"/microsoft-365-copilot/microsoft-365-copilot-setup",
211+
"redirect_document_id":false
212+
},
213+
{
214+
"source_path":"microsoft-365/admin/copilot/m365-early-access-program.yml",
215+
"redirect_url":"/microsoft-365-copilot/microsoft-365-early-access-program",
216+
"redirect_document_id":false
202217
}
203218

204219
]

0 commit comments

Comments
 (0)