Skip to content

Commit 31e2848

Browse files
committed
Merge branch 'main' into esignature-working
2 parents 6be5d3d + c2ee883 commit 31e2848

124 files changed

Lines changed: 2010 additions & 993 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/StaleBranch.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@ name: (Scheduled) Stale branch removal
22

33
permissions:
44
contents: write
5-
5+
6+
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
7+
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.
8+
# The workflow should not be configured to run after "deletion day" so that users can review the branches were deleted.
9+
# Recommendation: configure cron to run on days 1,15-31 where 1 is what's configured in 'DeleteOnDayOfMonth'. If 'DeleteOnDayOfMonth' is set to something else, update cron to run the two weeks leading up to it.
10+
611
on:
712
schedule:
8-
- cron: "0 9 1 * *"
13+
- cron: "0 9 1,15-31 * *"
914

10-
# workflow_dispatch:
15+
workflow_dispatch:
1116

1217

1318
jobs:

.openpublishing.redirection.admin.json

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,46 +2179,51 @@
21792179
"source_path": "microsoft-365/enterprise/google-groups-migration.md",
21802180
"redirect_url": "/microsoft-365/enterprise/deploy-identity-solution-identity-model",
21812181
"redirect_document_id": false
2182-
},
2183-
{
2184-
"source_path": "microsoft-365/admin/misc/experience-insights-help-articles.md",
2185-
"redirect_url": "/microsoft-365/admin/misc/experience-insights-dashboard",
2186-
"redirect_document_id": false
2187-
},
2188-
{
2189-
"source_path": "microsoft-365/admin/email/remove-license-from-shared-mailbox.md",
2190-
"redirect_url": "/microsoft-365/admin/email/create-a-shared-mailbox",
2191-
"redirect_document_id": false
2192-
},
2193-
{
2194-
"source_path": "microsoft-365/admin/admin-overview/what-is-microsoft-365.md",
2195-
"redirect_url": "/microsoft-365/business-premium/m365bp-overview",
2196-
"redirect_document_id": false
2197-
},
2198-
{
2199-
"source_path": "microsoft-365/admin/activity-reports/agent-usage.md",
2200-
"redirect_url": "/microsoft-365/admin/activity-reports/microsoft-365-copilot-agents",
2201-
"redirect_document_id": true
2202-
},
2203-
{
2204-
"source_path": "microsoft-365/admin/misc/places-ios-mobile.md",
2205-
"redirect_url": "/microsoft-365/admin/",
2206-
"redirect_document_id": false
2207-
},
2208-
{
2209-
"source_path": "microsoft-365/admin/misc/admin-controls-profile-videos.md",
2210-
"redirect_url": "/microsoft-365/admin/add-users/change-user-profile-photos",
2211-
"redirect_document_id": false
2212-
},
2213-
{
2214-
"source_path": "microsoft-365/admin/manage/change-contact-preferences.md",
2215-
"redirect_url": "/microsoft-365/admin/manage/change-address-contact-and-more",
2216-
"redirect_document_id": false
2217-
},
2218-
{
2219-
"source_path": "microsoft-365/admin/manage/use-qr-code-download-outlook.md",
2220-
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=2309759",
2221-
"redirect_document_id": false
2222-
}
2182+
},
2183+
{
2184+
"source_path": "microsoft-365/admin/misc/experience-insights-help-articles.md",
2185+
"redirect_url": "/microsoft-365/admin/misc/experience-insights-dashboard",
2186+
"redirect_document_id": false
2187+
},
2188+
{
2189+
"source_path": "microsoft-365/admin/email/remove-license-from-shared-mailbox.md",
2190+
"redirect_url": "/microsoft-365/admin/email/create-a-shared-mailbox",
2191+
"redirect_document_id": false
2192+
},
2193+
{
2194+
"source_path": "microsoft-365/admin/admin-overview/what-is-microsoft-365.md",
2195+
"redirect_url": "/microsoft-365/business-premium/m365bp-overview",
2196+
"redirect_document_id": false
2197+
},
2198+
{
2199+
"source_path": "microsoft-365/admin/activity-reports/agent-usage.md",
2200+
"redirect_url": "/microsoft-365/admin/activity-reports/microsoft-365-copilot-agents",
2201+
"redirect_document_id": true
2202+
},
2203+
{
2204+
"source_path": "microsoft-365/admin/misc/places-ios-mobile.md",
2205+
"redirect_url": "/microsoft-365/admin/",
2206+
"redirect_document_id": false
2207+
},
2208+
{
2209+
"source_path": "microsoft-365/admin/misc/admin-controls-profile-videos.md",
2210+
"redirect_url": "/microsoft-365/admin/add-users/change-user-profile-photos.md",
2211+
"redirect_document_id": false
2212+
},
2213+
{
2214+
"source_path": "microsoft-365/admin/manage/change-contact-preferences.md",
2215+
"redirect_url": "/microsoft-365/admin/manage/change-address-contact-and-more",
2216+
"redirect_document_id": false
2217+
},
2218+
{
2219+
"source_path": "microsoft-365/admin/manage/use-qr-code-download-outlook.md",
2220+
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=2309759",
2221+
"redirect_document_id": false
2222+
},
2223+
{
2224+
"source_path": "microsoft-365/admin/adoption/ai-assistance.md",
2225+
"redirect_url": "/microsoft-365/admin/adoption/ai-adoption-score",
2226+
"redirect_document_id": true
2227+
}
22232228
]
22242229
}

.openpublishing.redirection.commerce.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,11 @@
969969
"source_path": "microsoft-365/commerce/licenses/user-roles-faq.yml",
970970
"redirect_url": "/microsoft-365/commerce/licenses/manage-user-roles-vl",
971971
"redirect_document_id": false
972+
},
973+
{
974+
"source_path": "microsoft-365/commerce/licenses/contracts-faq.yml",
975+
"redirect_url": "/microsoft-365/commerce/licenses/manage-contracts-vl",
976+
"redirect_document_id": false
972977
}
973978
]
974979
}

copilot/TOC.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ items:
4040
href: microsoft-365-copilot-licensing.md
4141
- name: Enable users and welcome email
4242
href: microsoft-365-copilot-enable-users.md
43-
- name: Copilot Prompt Gallery
44-
href: copilot-prompt-gallery.md
4543
- name: Adoption resources
4644
href: microsoft-365-copilot-enablement-resources.md
4745
- name: Pay-as-you-go for Microsoft 365 Copilot
4846
items:
49-
- name: Microsoft 365 Copilot pay-as-you-go overview
47+
- name: Pay-as-you-go overview
5048
href: pay-as-you-go/overview.md
51-
- name: Set up pay-as-you-go for Microsoft 365 Copilot Chat
49+
- name: Set up pay-as-you-go
5250
href: pay-as-you-go/setup.md
53-
- name: Meters for Microsoft 365 Copilot Chat pay-as-you-go
51+
- name: Meters for pay-as-you-go
5452
href: pay-as-you-go/meters.md
55-
- name: View costs and billing for Microsoft 365 Copilot Chat pay-as-you-go
53+
- name: View costs and billing for pay-as-you-go
5654
href: pay-as-you-go/view-cost.md
5755
- name: Manage Microsoft 365 Copilot
5856
items:
5957
- name: Manage Microsoft 365 Copilot scenarios
6058
href: microsoft-365-copilot-page.md
6159
- name: Pin Copilot Chat to the navigation bar
6260
href: pin-copilot.md
61+
- name: Manage scheduled prompts
62+
href: scheduled-prompts.md
6363
- name: Enable Facilitator in Microsoft Teams
6464
href: /microsoftteams/facilitator-teams?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
6565
- name: Manage Copilot for Microsoft Teams meetings and events
@@ -72,14 +72,12 @@ items:
7272
href: /viva/copilot/viva-copilot-overview?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
7373
- name: Manage access to Microsoft 365 Copilot in Viva
7474
href: /viva/copilot/copilot-access-management?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
75-
- name: Maximize the value of Microsoft 365 Copilot for your organization
75+
- name: Maximize the value of Microsoft 365 Copilot
7676
items:
77-
- name: Use the Microsoft Copilot Dashboard
78-
href: /viva/insights/org-team-insights/copilot-dashboard?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
79-
- name: View the Microsoft 365 Copilot readiness report
80-
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-readiness?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
81-
- name: View the Microsoft 365 Copilot usage report
82-
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
77+
- name: Reports and insights
78+
href: microsoft-365-copilot-reports-for-admins.md
79+
- name: Copilot Prompt Gallery
80+
href: copilot-prompt-gallery.md
8381
- name: "Trust: Data, Privacy, and Security"
8482
items:
8583
- name: Data, privacy, and security for Microsoft 365 Copilot

0 commit comments

Comments
 (0)