Skip to content

Commit 41de6a7

Browse files
authored
Merge branch 'public' into patch-1
2 parents 21ea262 + 93cf569 commit 41de6a7

930 files changed

Lines changed: 4814 additions & 8204 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.

.github/workflows/M365Endpoints.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ permissions:
44
contents: write
55
pull-requests: write
66
actions: read
7-
87

8+
# Reduced the number of run times per day to three and changed to run only Mon-Fri since those are the days we have publishing. No point running on weekends.
9+
# Tried to reflect PDT/PST. There will be a couple weeks during the changeover months where time will be off an hour.
910
on:
10-
schedule:
11-
- cron: "0 */6 * * *"
11+
schedule:
12+
### PST ###
13+
- cron: "45 17,22 * 11,12,1,2 1-5" # 09:45 & 14:45 PST = 17:45 & 22:45 UTC, same day (Mon-Fri)
14+
- cron: "45 7 * 11,12,1,2 2-6" # 23:45 PST = 07:45 UTC, next day (Tue-Sat)
15+
### PDT ###
16+
- cron: "45 16,21 * 3-10 1-5" # 09:45 & 14:45 PDT = 16:45 & 21:45 UTC, same day (Mon-Fri)
17+
- cron: "45 6 * 3-10 2-6" # 23:45 PDT = 06:45 UTC, next day (Tue-Sat)
1218

1319
workflow_dispatch:
1420

@@ -766,4 +772,4 @@ jobs:
766772
name: Upload run data artifact
767773
with:
768774
name: RunData
769-
path: "${{ github.workspace }}/run-data/endpoints*"
775+
path: "${{ github.workspace }}/run-data/endpoints*"

.openpublishing.redirection.admin.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,11 @@
21992199
"source_path": "microsoft-365/admin/misc/places-ios-mobile.md",
22002200
"redirect_url": "/microsoft-365/admin/",
22012201
"redirect_document_id": false
2202-
}
2202+
},
2203+
{
2204+
"source_path": "microsoft-365/admin/misc/admin-controls-profile-videos.md",
2205+
"redirect_url": "/microsoft-365/admin/add-users/change-user-profile-photos.md",
2206+
"redirect_document_id": false
2207+
}
22032208
]
22042209
}

.openpublishing.redirection.commerce.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,16 @@
959959
"source_path": "microsoft-365/commerce/licenses/product-keys-faq.yml",
960960
"redirect_url": "/microsoft-365/commerce/licenses/product-keys-for-vl",
961961
"redirect_document_id": false
962+
},
963+
{
964+
"source_path": "microsoft-365/commerce/licenses/manage-license-requests-faq.yml",
965+
"redirect_url": "/microsoft-365/commerce/licenses/manage-license-reservations-vl",
966+
"redirect_document_id": false
967+
},
968+
{
969+
"source_path": "microsoft-365/commerce/licenses/user-roles-faq.yml",
970+
"redirect_url": "/microsoft-365/commerce/licenses/manage-user-roles-vl",
971+
"redirect_document_id": false
962972
}
963973
]
964974
}

.openpublishing.redirection.lighthouse.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@
1414
"source_path":"microsoft-365/lighthouse/m365-lighthouse-deploy-baselines.md",
1515
"redirect_url":"/microsoft-365/lighthouse/m365-lighthouse-deploy-standard-tenant-configurations-overview",
1616
"redirect_document_id":false
17+
},
18+
{
19+
"source_path":"microsoft-365/lighthouse/m365-lighthouse-create-customer-report.md",
20+
"redirect_url":"/microsoft-365/lighthouse/m365-lighthouse-tenants-page-overview",
21+
"redirect_document_id":false
22+
},
23+
{
24+
"source_path":"microsoft-365/lighthouse/m365-lighthouse-get-access-to-sales-advisor.md",
25+
"redirect_url":"/microsoft-365/lighthouse/m365-lighthouse-sales-advisor-overview",
26+
"redirect_document_id":true
1727
}
1828
]
1929
}

.openpublishing.redirection.lti.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path": "microsoft-365/lti/use-onedrive-with-lms.md",
1010
"redirect_url": "/lti/onedrive-lti",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "microsoft-365/lti/assignments-lti-license-terms.md",
15+
"redirect_url": "/lti/index",
16+
"redirect_document_id": false
1217
}
1318
]
14-
}
19+
}

.openpublishing.redirection.syntex.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,16 @@
159159
"source_path":"microsoft-365/syntex/feature-limited-license.md",
160160
"redirect_url":"/microsoft-365/syntex/syntex-licensing",
161161
"redirect_document_id":true
162+
},
163+
{
164+
"source_path":"microsoft-365/syntex/train-model.md",
165+
"redirect_url":"/microsoft-365/syntex/syntex-overview",
166+
"redirect_document_id":true
167+
},
168+
{
169+
"source_path":"microsoft-365/syntex/video-library.md",
170+
"redirect_url":"/microsoft-365/syntex/unstructured-setup",
171+
"redirect_document_id":true
162172
}
163173
]
164174
}

.openpublishing.redirection.topics.json

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,206 @@
99
"source_path": "microsoft-365/admin/manage/manage-self-service-purchases-org-trials-for-msproject.md",
1010
"redirect_url": "/ProjectWeb/manage-self-service-purchases-org-trials-for-msproject",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "microsoft-365/topics/add-topics-app.md",
15+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "microsoft-365/topics/adoption-resources.md",
20+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "microsoft-365/topics/create-a-topic.md",
25+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "microsoft-365/topics/curate-a-topic-in-multilingual.md",
30+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "microsoft-365/topics/edit-a-topic.md",
35+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "microsoft-365/topics/export-topics-powershell.md",
40+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "microsoft-365/topics/faq-topics.md",
45+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "microsoft-365/topics/get-started-with-viva-topics.md",
50+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "microsoft-365/topics/health-metrics.md",
55+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "microsoft-365/topics/manage-topic-discovery.md",
60+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "microsoft-365/topics/manage-topic-visibility.md",
65+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "microsoft-365/topics/manage-topics.md",
70+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "microsoft-365/topics/merge-topics.md",
75+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "microsoft-365/topics/plan-topic-experiences.md",
80+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "microsoft-365/topics/rename-topic-center.md",
85+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "microsoft-365/topics/restrict-access-to-topics.md",
90+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "microsoft-365/topics/save-topic-as-draft.md",
95+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "microsoft-365/topics/scale-topics.md",
100+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "microsoft-365/topics/search.md",
105+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "microsoft-365/topics/set-up-topic-experiences.md",
110+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "microsoft-365/topics/sharepoint-taxonomy.md",
115+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path": "microsoft-365/topics/topic-center-overview.md",
120+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path": "microsoft-365/topics/topic-experiences-discovery-curation.md",
125+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path": "microsoft-365/topics/topic-experiences-get-ready.md",
130+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path": "microsoft-365/topics/topic-experiences-knowledge-managers.md",
135+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "microsoft-365/topics/topic-experiences-overview.md",
140+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "microsoft-365/topics/topic-experiences-roles.md",
145+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "microsoft-365/topics/topic-experiences-security-privacy.md",
150+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "microsoft-365/topics/topic-experiences-security-trimming.md",
155+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "microsoft-365/topics/topic-experiences-topic-contributors.md",
160+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "microsoft-365/topics/topic-experiences-user-permissions.md",
165+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "microsoft-365/topics/topic-experiences-viva-engage.md",
170+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path": "microsoft-365/topics/topics-adoption-getstarted.md",
175+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path": "microsoft-365/topics/topics-analytics.md",
180+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path": "microsoft-365/topics/topics-card-viva-connections.md",
185+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path": "microsoft-365/topics/topics-engagement-metrics.md",
190+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path": "microsoft-365/topics/topics-language-support.md",
195+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path": "microsoft-365/topics/topics-lightweight-management.md",
200+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path": "microsoft-365/topics/trial-topics.md",
205+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path": "microsoft-365/topics/where-to-find-topics.md",
210+
"redirect_url": "/microsoft-365/topics/changes-coming-to-topics",
211+
"redirect_document_id": false
12212
}
13213
]
14214
}

copilot/TOC.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,28 @@ items:
55
href: release-notes.md
66
- name: Get started with Microsoft 365 Copilot
77
items:
8-
- name: Overview
8+
- name: What is Microsoft 365 Copilot?
99
href: microsoft-365-copilot-overview.md
1010
- name: Architecture and data protection diagrams
1111
items:
1212
- name: Architecture & how Copilot works
1313
href: microsoft-365-copilot-architecture.md
1414
- name: Data protection and auditing
1515
href: microsoft-365-copilot-architecture-data-protection-auditing.md
16-
- name: Select your Copilot
16+
- name: Which Copilot is right for me?
1717
href: which-copilot-for-your-organization.md
1818
- name: Get your data ready for Microsoft 365 Copilot
1919
items:
2020
- name: License options
2121
href: microsoft-365-copilot-licensing.md
22-
- name: License feature comparison list
22+
- name: E3 and E5 license feature comparison list
23+
displayName: e3 vs e5
2324
href: microsoft-365-copilot-license-feature-overview.md
2425
- name: E3 implementation guide
26+
displayName: get started
2527
href: microsoft-365-copilot-e3-guide.md
2628
- name: E5 implementation guide
29+
displayName: get started
2730
href: microsoft-365-copilot-e5-guide.md
2831
- name: Blueprint to prevent oversharing
2932
href: microsoft-365-copilot-blueprint-oversharing.md
@@ -33,7 +36,7 @@ items:
3336
href: microsoft-365-copilot-setup.md
3437
- name: Requirements and prerequisites
3538
href: microsoft-365-copilot-requirements.md
36-
- name: License add-on list
39+
- name: License options
3740
href: microsoft-365-copilot-licensing.md
3841
- name: Enable users and welcome email
3942
href: microsoft-365-copilot-enable-users.md
@@ -43,7 +46,7 @@ items:
4346
href: microsoft-365-copilot-enablement-resources.md
4447
- name: Manage Microsoft 365 Copilot
4548
items:
46-
- name: Manage Microsoft 365 Copilot settings
49+
- name: Manage Microsoft 365 Copilot scenarios
4750
href: microsoft-365-copilot-page.md
4851
- name: Pin Copilot Chat to the navigation bar
4952
href: pin-copilot.md

0 commit comments

Comments
 (0)