Skip to content

Commit f53a654

Browse files
authored
Merge branch 'main' into docs-editor/manage-billing-accounts-1737676251
2 parents 2140fae + 571a958 commit f53a654

23 files changed

Lines changed: 104 additions & 314 deletions

.openpublishing.redirection.syntex.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,12 @@
154154
"source_path":"microsoft-365/backup/backup-limitations.md",
155155
"redirect_url":"/microsoft-365/backup/backup-faq",
156156
"redirect_document_id":true
157+
},
158+
{
159+
"source_path":"microsoft-365/syntex/feature-limited-license.md",
160+
"redirect_url":"/microsoft-365/syntex/syntex-licensing",
161+
"redirect_document_id":true
157162
}
158-
]
159-
}
163+
]
164+
}
165+

copilot/manage-public-web-access.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.collection:
1313
- m365copilot
1414
- magic-ai-copilot
1515
hideEdit: true
16-
ms.date: 01/15/2025
16+
ms.date: 01/24/2025
1717
---
1818

1919
# Data, privacy, and security for web search in Microsoft 365 Copilot and Microsoft 365 Copilot Chat
@@ -134,13 +134,13 @@ If a Microsoft 365 Copilot user turns off the **Web content** toggle in work cha
134134

135135
Microsoft 365 Copilot users can manage web search in work chat by following these steps:
136136

137-
1. Select the plugin menu at the bottom right of the chat input box in Microsoft 365 Copilot when using work chat.
137+
1. Select the menu in the top right corner of the screen in Microsoft 365 Copilot when using work chat.
138138

139-
:::image type="content" source="media/copilot-prompt-box.png" alt-text="Image showing a cursor pointing to the plugin menu in the chat input box in Microsoft 365 Copilot.":::
139+
:::image type="content" source="media/copilot-work-tab-menu.png" alt-text="Screenshot of the Work tab in Microsoft 365 Copilot. The menu option in the top right corner is highlighted with a red box.":::
140140

141141
2. Turn off the **Web content** toggle.
142142

143-
:::image type="content" source="media/copilot-web-toggle.png" alt-text="Image showing a cursor pointing to the web content plugin toggle enabled.":::
143+
:::image type="content" source="media/copilot-web-content-toggle.png" alt-text="Screenshot of the Web content toggle enabled. The toggle is highlighted with a red box.":::
144144

145145
> [!NOTE]
146146
> The privacy setting for optional connected experiences available to users in Microsoft 365 apps (for example, in Word, Excel, or Teams) has no effect on the availability of web search. For example, if a user turns off optional connected experiences, web search can still be available to the user.
-72 KB
Binary file not shown.
39.2 KB
Loading
-66.2 KB
Binary file not shown.
151 KB
Loading

microsoft-365/admin/manage/manage-copilot-agents-integrated-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The hub Copilot experience shows the list of agents that are available and deplo
5454

5555
Admins can manage agents as apps in the Integrated apps section of the Microsoft 365 admin center, where they can see the list of available, deployed, or blocked apps for their organization. They are able to:
5656

57-
- Make am agent available to specific users or groups.
57+
- Make an agent available to specific users or groups.
5858
- Block or unblock agents for the complete organization.
5959
- Deploy or remove agents for the complete organization or specific users or groups.
6060

@@ -64,7 +64,7 @@ You can also check if a specific app has Copilot support by selecting it from ap
6464

6565
## Enable or disable Copilot extensibility
6666

67-
Admins can enable or disable Copilot extensibility for their org by using a preview setting in the tenant default options in the Integrated Apps section of the Microsoft 365 admin center. This setting lets you control who can access agents in their organization. The setting will be available until February 12th, 2025. Over the next 90 days, we’ll introduce additional agent reports and controls in each of the experiences, as well as more comprehensive guidance about how to manage this spectrum of agents across these controls.
67+
Admins can enable or disable Copilot extensibility for their org by using a preview setting in the tenant default options in the Integrated Apps section of the Microsoft 365 admin center. This setting lets you control who can access agents in their organization. The setting will be available until February 12, 2025. Over the next 90 days, we’ll introduce additional agent reports and controls in each of the experiences, as well as more comprehensive guidance about how to manage this spectrum of agents across these controls.
6868

6969
The preview setting has three options:
7070

microsoft-365/archive/archive-compliance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The affect of Microsoft 365 Archive on compliance offerings includes the followi
3535

3636
- **Data lifecycle management and records management** – Archived sites still honor the retention and deletion periods from any retention policies or retention labels. For more information, see [How retention works with Microsoft 365 Archive](/purview/retention-policies-sharepoint#how-retention-works-with-microsoft-365-archive).
3737

38-
- **eDiscovery** – eDiscovery still finds all content even if archived. However, eDiscovery won't be able to directly reactivate located files. Before exporting or viewing content of an eDiscovery case, the SharePoint admin has to reactivate the relevant sites.
38+
- **eDiscovery** – eDiscovery still finds all content even if archived. eDiscovery will also be able to export directly from archived content but may take longer to export.
3939

4040
- **Bring your own key (BYOK)** – All archived content will comply with the BYOK promises, for any tenant who already uses the BYOK feature or enables it after archiving sites.
4141

microsoft-365/archive/archive-setup.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: chuckedmonson
55
manager: jtremper
66
audience: admin
77
ms.reviewer: sreelakshmi
8-
ms.date: 01/13/2025
8+
ms.date: 01/24/2025
99
ms.topic: conceptual
1010
ms.service: microsoft-365-archive
1111
ms.custom: archive
@@ -31,15 +31,15 @@ To set up Microsoft 365 Archive, follow these steps:
3131
3. [Turn on Microsoft 365 Archive](#set-up-microsoft-365-archive) in the Microsoft 365 admin center.
3232

3333
4. [Manage Microsoft 365 Archive](archive-manage.md) in the SharePoint admin center.
34-
34+
<!---
3535
The following video demonstrates the steps to help you set up pay-as-you-go billing.
3636
3737
</br>
3838
3939
> [!VIDEO https://learn-video.azurefd.net/vod/player?id=fea6b1e5-b757-4f33-8cdf-4fcc714c72e0]
4040
4141
</br>
42-
42+
--->
4343
## Prerequisites
4444

4545
### Licensing

0 commit comments

Comments
 (0)