Skip to content

Commit 5a5ddd1

Browse files
authored
Merge branch 'main' into patch-1
2 parents 6275fec + d7778a6 commit 5a5ddd1

14 files changed

Lines changed: 130 additions & 20 deletions

.openpublishing.redirection.copilot.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path": "copilot/microsoft-365-copilot-search-privacy.md",
1010
"redirect_url": "/copilot/microsoft-365-copilot-search",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "copilot/pin-copilot.md",
15+
"redirect_url": "/copilot/microsoft-365/pin-copilot-chat-navbar",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

copilot/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ items:
6565
href: microsoft-365-copilot-app-admin-settings.md
6666
- name: Set up Organizational Asset Library
6767
href: enterprise-brand-manager.md
68+
- name: Pin the Copilot app to the Windows taskbar
69+
href: pin-copilot-taskbar.md
6870
- name: Pin Copilot Chat to the navigation bar
69-
href: pin-copilot.md
71+
href: pin-copilot-chat-navbar.md
7072
- name: Copilot in Microsoft 365 admin centers
7173
href: copilot-for-microsoft-365-admin.md
7274
- name: Multiple account access for work and school documents

copilot/employee-self-service/servicenow.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,25 @@ This task is required to define the custom script as a resource for the REST API
183183
|---------|---------|
184184
|Name |GetAllUserCriteria |
185185
|Relative path |/user_criteria |
186-
|Script |Copy and paste the following script AS IS:<br> (function execute (/*RESTAPIRequest*/ request,<br>/*RESTAPIResponse*/ response)<br>{<br>var queryParams = request.queryParams;<br>var user = new String(queryParams.user);<br>return (new<br>sn_uc.UserCriteriaLoader()).getAllUserCriteria(user);<br>}<br>)(request, response); |
186+
|Script |Copy and paste the script (noted after this table) exactly as is. |
187187
|Requires authentication |Checked |
188188
|Requires ACL authorization |Checked<br>Ensure that the ACL created in Task 2 is set correctly and remove any other default values. |
189189

190+
#### Script to copy
191+
192+
```javascript
193+
(function execute (/*RESTAPIRequest*/ request,
194+
/*RESTAPIResponse*/ response )
195+
{
196+
var queryParams = request.queryParams;
197+
var user = new String(queryParams.user);
198+
return (new
199+
sn_uc.UserCriteriaLoader()).getAllUserCriteria(user);
200+
}
201+
) (request, response);
202+
```
203+
204+
190205
4. Select **Submit** to save changes.
191206

192207
This wraps up all the configuration required on the ServiceNow side, now the next set of tasks are on Microsoft 365 side.
192 KB
Loading
373 KB
Loading
89.7 KB
Loading

copilot/microsoft-365-copilot-app-admin-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The following table lists the Copilot app settings that you can configure.
5858
| Setting | Description | Related content |
5959
|---|---|---|
6060
| Search | ✅ Turned on by default <br/><br/>In the **[Microsoft 365 admin center](https://admin.microsoft.com)** > **Settings** > **Search & intelligence**, you can turn on Microsoft Search in the Copilot app. By default, Microsoft Search is allowed and turned on.<br/><br/> You can also enable **Item insights** and show recommended files. Users can turn off Item insights, but we recommend that it stays on. | - [Set up Microsoft Search](/microsoftsearch/setup-microsoft-search) <br/> - [Item insights in Microsoft 365](/graph/item-insights-overview) |
61-
| Chat | ✅ Pinned by default, depending on license. <br/><br/> Depending on your license, Microsoft 365 Copilot Chat might be automatically pinned in the Copilot app. If not, you can pin Chat to the Copilot app. | [Pin Microsoft 365 Copilot Chat to the navigation bar](pin-copilot.md). <br/><br/> There are Chat features you can configure that affect the Chat experience in the Copilot app, like allowing web searches. To learn more, see [Manage Microsoft 365 Copilot Chat](/copilot/manage).|
61+
| Chat | ✅ Pinned by default, depending on license. <br/><br/> Depending on your license, Microsoft 365 Copilot Chat might be automatically pinned in the Copilot app. If not, you can pin Chat to the Copilot app. | [Pin Microsoft 365 Copilot Chat to the navigation bar](pin-copilot-chat-navbar.md). <br/><br/> There are Chat features you can configure that affect the Chat experience in the Copilot app, like allowing web searches. To learn more, see [Manage Microsoft 365 Copilot Chat](/copilot/manage).|
6262
| Agents | ✅ Built-in agents turned on by default <br/><br/>In the **[Microsoft 365 admin center](https://admin.microsoft.com)** > **Settings** > **Integrated Apps**, admins can deploy or block agents from showing in the Copilot app. End users can also add agents to their Copilot app experience. | [Manage agents for Microsoft 365 Copilot](/microsoft-365/admin/manage/manage-copilot-agents-integrated-apps) |
6363
| Pages | ✅ Allowed by default <br/><br/>Use Cloud Policy to allow users to create and view Copilot Pages in the Copilot app. | [Admin policies for Copilot Pages and Copilot Notebooks](/microsoft-365/loop/cpcn-admin-configuration) |
6464
| Notebooks | ✅ Allowed by default <br/><br/>Use Cloud Policy to allow users to create and view Copilot Notebooks in the Copilot app. | [Admin policies for Copilot Pages and Copilot Notebooks](/microsoft-365/loop/cpcn-admin-configuration) |

copilot/microsoft-365-copilot-file-upload-control.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ appliesto:
2525

2626
File upload is enabled by default in both Microsoft 365 Copilot and Microsoft 365 Copilot Chat. It lets users upload files like Word docs, Excel files, and PDFs to prompt Copilot and Copilot Chat to reason over them as part of its response. File upload limits apply in Copilot Chat.
2727

28-
To manage the file upload feature so it aligns with organizational policies, user preferences, and security considerations, an admin control is available. This control allows admins to determine whether users can upload local files or attach cloud files when using Copilot or Copilot Chat.
28+
To manage the file upload feature so it aligns with organizational policies, user preferences, and security considerations, an admin control is available. This control allows admins to determine whether users can upload local files or attach cloud files when using Copilot or Copilot Chat.
2929

3030
> [!NOTE]
31-
> The file upload control will be available in July 2025.
31+
> The file upload control will be available in mid-July 2025. Once implemented, it may take up to 24 hours for the changes to be reflected for end users.
3232
3333
## IT admin file upload control
3434

3535
The file upload control is available only in [Cloud Policy service for Microsoft 365](/microsoft-365-apps/admin-center/overview-cloud-policy). If you enable this policy setting, you can choose one of the following options for file uploads in Copilot and Copilot Chat:
3636
- **Allow file uploads in both Microsoft 365 Copilot and Microsoft 365 Copilot Chat**—allows users to upload files in both experiences. This is the default setting.
3737
- **Prevent file uploads in both Microsoft 365 Copilot and Microsoft 365 Copilot Chat**—disables file upload in both experiences.
38-
- **Disable file uploads in Microsoft 365 Copilot Web mode and Microsoft 365 Copilot Chat while allowing them in Microsoft 365 Copilot Work mode**—enables file upload in Microsoft 365 Copilot Chat *Work mode only* and disables file upload in Microsoft 365 Copilot Web mode and Microsoft 365 Copilot Chat.
38+
- **Disable file uploads in Microsoft 365 Copilot Web mode and Microsoft 365 Copilot Chat while allowing file uploads in Microsoft 365 Copilot Work mode**—enables file upload in Microsoft 365 Copilot Chat *Work mode only* and disables file upload in Microsoft 365 Copilot Web mode and Microsoft 365 Copilot Chat.
3939

4040
:::image type="content" source="media/copilot-file-upload-800.png" alt-text="Screenshot that shows Microsoft 365 Copilot file upload control." lightbox="media/copilot-file-upload-raw.png":::
4141

copilot/microsoft-365-copilot-page.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ When Copilot Chat is pinned, it makes it easier for people in your organization
324324

325325
To learn more, see:
326326

327-
- [Pin Microsoft 365 Copilot Chat to the navigation bar](pin-copilot.md)
327+
- [Pin Microsoft 365 Copilot Chat to the navigation bar](pin-copilot-chat-navbar.md)
328328
- [Pin apps to the taskbar](/windows/configuration/taskbar/pinned-apps)
329329

330330
### Web search for Microsoft 365 Copilot and Microsoft Copilot

copilot/microsoft-365-copilot-privacy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Microsoft 365 Copilot is a sophisticated processing and orchestration engine tha
2929
For an overview of how these three components work together, see [Microsoft 365 Copilot overview](microsoft-365-copilot-overview.md). For links to other content related to Microsoft 365 Copilot, see [Microsoft 365 Copilot documentation](index.yml).
3030

3131
> [!IMPORTANT]
32-
> - Microsoft 365 Copilot is compliant with our existing privacy, security, and compliance commitments to Microsoft 365 commercial customers, including the General Data Protection Regulation (GDPR) and European Union (EU) Data Boundary.
32+
> - Microsoft 365 Copilot, including [Microsoft 365 Copilot Search](/copilot/microsoft-365/microsoft-365-copilot-search), is compliant with our existing privacy, security, and compliance commitments to Microsoft 365 commercial customers, including the General Data Protection Regulation (GDPR) and European Union (EU) Data Boundary.
3333
> - Prompts, responses, and data accessed through Microsoft Graph aren't used to train foundation LLMs, including those used by Microsoft 365 Copilot.
3434
> - Microsoft 365 Copilot operates with multiple protections, which include, but aren't limited to, [blocking harmful content](#how-does-copilot-block-harmful-content), [detecting protected material](#does-copilot-provide-protected-material-detection), and [blocking prompt injections (jailbreak attacks)](#does-copilot-block-prompt-injections-jailbreak-attacks).
3535

0 commit comments

Comments
 (0)