Merge pull request #21223 from MicrosoftDocs/main

merge main to live, 10:30 AM Thursday 6/29

Author: American-Dipper

microsoft-365/compliance/TOC.yml

@@ -1329,6 +1329,8 @@
               href: dlp-test-dlp-policies.md
             - name: Use the Microsoft Purview Data Loss Prevention migration assistant for Symantec
               href: dlp-migration-assistant-for-symantec-use.md
+            - name: Data loss prevention policy tip reference for Outlook for Microsoft 365
+              href: dlp-ol365-win32-policy-tips.md       
             - name: Data loss prevention policy tip reference for Outlook on the Web
               href: dlp-owa-policy-tips.md       
 - name: Manage data lifecycle & records

microsoft-365/compliance/dlp-ol365-win32-policy-tips.md

@@ -616,6 +616,10 @@ The actions that are available in a rule depend on the locations that have been
 - Add HTML Disclaimer
 - Modify Email Subject
 - Deliver the message to the hosted quarantine
+- Apply branding to encrypted messages 
+
+> [!TIP]
+> For the **Apply branding to encrypted messages** action, if you already have Office Message Encryption implemented, the templates will automatically show up in the drop down list. If you want to implement Microsoft Purview Message Encryption, see  for background on OME and procedure to create and configure your branding templates.
 
 > [!TIP]
 > For more information on the actions that Exchange supports, including PowerShell values, see: [Data loss prevention Exchange conditions and actions reference](dlp-exchange-conditions-and-actions.md).
@@ -851,6 +855,7 @@ To learn more about user notification and policy tip configuration and use, incl
 
 Details on support for policy tips and notifications for different apps can be found here:
 
+- [Data loss prevention policy tip reference for Outlook for Microsoft 365](dlp-ol365-win32-policy-tips.md)
 - [Data loss prevention policy tip reference for Outlook on the Web](dlp-owa-policy-tips.md)
 
 #### Blocking and notifications in SharePoint Online and OneDrive for Business

microsoft-365/compliance/dlp-policy-reference.md

@@ -5,7 +5,7 @@ f1.keywords:
 ms.author: cabailey
 author: cabailey
 manager: laurawi
-ms.date: 04/26/2023
+ms.date: 06/29/2023
 audience: Admin
 ms.topic: conceptual
 ms.service: O365-seccomp
@@ -138,10 +138,14 @@ To safeguard against the original file being deleted or moved by users before th
 
 ## How retention works with OneNote content
 
-When you apply a retention policy to a location that includes OneNote content, or a retention label to a OneNote folder, behind the scenes, the different OneNote sections are individual files that inherit the retention settings. This means that each section will be individually retained and deleted, according to the retention settings you specify.
+When you apply a retention policy to a location that includes OneNote content, or a retention label to a OneNote folder, the different OneNote sections inherit the retention settings as individual files. Pages from each section are contained within the file and inherit the retention settings from their parent section. 
+
+Because of this structure, each section will be individually retained and deleted (with all its pages), according to the retention settings you specify. 
 
 Only sections are impacted by the retention settings that you specify. For example, although you see a **Modified** date for each individual notebook, this date is not used by Microsoft 365 retention.
 
+:::image type="content" source="../media/onenote-backend-structure.png" alt-text="OneNote folder and file structure to demonstrate how retention settings are applied to each section and then inherited by pages in that section.":::
+
 ## How retention works with document versions
 
 Versioning is a feature of all document lists and libraries in SharePoint and OneDrive. By default, versioning retains a minimum of 500 major versions, although you can change this limit. For more information, see [Enable and configure versioning for a list or library](https://support.office.com/article/1555d642-23ee-446a-990a-bcab618c7a37) and [How versioning works in lists and libraries](https://support.microsoft.com/office/how-versioning-works-in-lists-and-libraries-0f6cd105-974f-44a4-aadb-43ac5bdfd247).

microsoft-365/compliance/dlp-policy-tips-reference.md

@@ -193,9 +193,8 @@ Retention labels can be published to different locations, depending on what the
 | If the retention label is... | Then the label policy can be applied to... |
 |:-----|:-----|
 |Published to admins and end users  |Exchange, SharePoint, OneDrive, Microsoft 365 Groups  |
-|Auto-applied based on sensitive information types or trainable classifiers  |Exchange, SharePoint, OneDrive  |
-|Auto-applied based on keywords or a query  |Exchange, SharePoint, OneDrive, Microsoft 365 Groups  |
-|Auto-applied to cloud attachments  |SharePoint, OneDrive, Microsoft 365 Groups  |
+|Auto-applied based on sensitive information types, keywords or a query, or trainable classifiers  |Exchange, SharePoint, OneDrive, Microsoft 365 Groups |
+|Auto-applied to cloud attachments |SharePoint, OneDrive, Microsoft 365 Groups |
 
 Exchange public folders, Skype, Teams and Yammer messages don't support retention labels. To retain and delete content from these locations, use retention policies instead.
 

microsoft-365/compliance/retention-policies-sharepoint.md

@@ -114,7 +114,13 @@ Advanced deployment guides in the admin center require authentication to a Micro
 
 |**Guide - [Setup Portal](https://go.microsoft.com/fwlink/?linkid=2220880)** |**Guide - [Admin Center](https://go.microsoft.com/fwlink/?linkid=2224913)** |**Description** |
 |---------|---------|---------|
-|[Deploy employee experience with Microsoft Viva](https://go.microsoft.com/fwlink/?linkid=2223653)|[Deploy employee experience with Microsoft Viva](https://go.microsoft.com/fwlink/?linkid=2224787)|Viva is an integrated, employee experience platform (EXP) that brings together communications, knowledge, learning, resources, and insights into the flow of work and fosters a culture where people and teams thrive and are empowered to be their best from anywhere. You can use the steps and guidance in the guides linked here to deploy one or more Viva apps and achieve better employee engagement throughout your organization.|
+|[Deploy employee experience with Microsoft Viva](https://go.microsoft.com/fwlink/?linkid=2241022)|[Deploy employee experience with Microsoft Viva](https://go.microsoft.com/fwlink/?linkid=2224787)|Viva is an integrated, employee experience platform (EXP) that brings together communications, knowledge, learning, resources, and insights into the flow of work and fosters a culture where people and teams thrive and are empowered to be their best from anywhere. You can use the steps and guidance in the guides linked here to deploy one or more Viva apps and achieve better employee engagement throughout your organization.|
+|[Enable Microsoft Viva Connections](https://go.microsoft.com/fwlink/?linkid=2222984)     |[Enable Microsoft Viva Connections](https://go.microsoft.com/fwlink/?linkid=2224697)         | Encourage meaningful connections while fostering a culture of inclusion and aligning the entire organization around your vision, mission, and strategic priorities.      |
+|[Enable Microsoft Viva Engage](https://go.microsoft.com/fwlink/?linkid=2223067)   |  [Enable Microsoft Viva Engage](https://go.microsoft.com/fwlink/?linkid=2224797)       | Bring people together across the organization to connect with leaders, coworkers, and communities; crowdsource answers and ideas; share their work and experience; and find belonging at work.        |
+|[Enable Microsoft Viva Goals](https://go.microsoft.com/fwlink/?linkid=2222980)    | [Enable Microsoft Viva Goals](https://go.microsoft.com/fwlink/?linkid=2224796)        | Align teams with your organization's strategic priorities, driving results and a thriving business.        |
+|[Enable ‎Microsoft Viva Insights](https://go.microsoft.com/fwlink/?linkid=2240668)    | [Enable ‎Microsoft Viva Insights](https://go.microsoft.com/fwlink/?linkid=2224795)       | Viva Insights‎ helps improve productivity and wellbeing through data-driven, privacy-protected insights and recommendations.        |
+|[Enable Microsoft Viva Learning](https://go.microsoft.com/fwlink/?linkid=2223163)     |[Enable Microsoft Viva Learning](https://go.microsoft.com/fwlink/?linkid=2225000)         | Bring enterprise learning into the flow of work by connecting content from your organization, learning management systems, non-‎Microsoft‎ providers, and ‎Microsoft‎.     |
+|[Enable Microsoft Viva Topics](https://go.microsoft.com/fwlink/?linkid=2222986)    |[Enable Microsoft Viva Topics](https://go.microsoft.com/fwlink/?linkid=2224826)         |  Use AI to automatically organize content and expertise across your systems and teams into related topics, like projects, products, processes, and customers.      |
 |[Microsoft 365 Apps setup guide](https://go.microsoft.com/fwlink/?linkid=2234169)|[Microsoft 365 Apps setup guide](https://go.microsoft.com/fwlink/?linkid=2233871)|The **Microsoft 365 Apps setup guide** provides comprehensive guidance for setting up and deploying the latest versions of Office products like Word, Excel, PowerPoint, and OneNote on your users' devices. You'll be walked through the activation process for your Microsoft 365 product key, as well as various deployment methods including easy self-install options and enterprise deployments with management tools. Additionally, the guide offers instructions on assessing your environment, determining your specific deployment requirements, and implementing the necessary support tools to ensure a successful installation.|
 ||[Mobile apps setup guide](https://go.microsoft.com/fwlink/?linkid=2224813)|The **Mobile apps setup guide** provides instructions for the download and installation of Office apps on your Windows, iOS, and Android mobile devices. This guide provides you with step-by-step information to download and install Microsoft 365 and Office 365 apps on your phone and tablet devices.|
 |[Microsoft Teams setup guide]( https://go.microsoft.com/fwlink/?linkid=2222975)|[Microsoft Teams setup guide](https://go.microsoft.com/fwlink/?linkid=2224815)|The **Microsoft Teams setup guide** provides your organization with guidance to set up team workspaces that host real-time conversations through messaging, calls, and audio or video meetings for both team and private communication. Use the tools in this guide to configure Guest access, set who can create teams, and add team members from a .csv file, all without the need to open a PowerShell session. You'll also get best practices for determining your organization's network requirements and ensuring a successful Teams deployment.|

microsoft-365/compliance/retention.md

@@ -1,11 +1,7 @@
 ---
 title: Import, export, and deploy exploit protection configurations
 description: Use Group Policy to deploy mitigations configuration.
-keywords: Exploit protection, mitigations, import, export, configure, convert, conversion, deploy, install
-ms.pagetype: security
 ms.service: microsoft-365-security
-ms.mktglfcycl: manage
-ms.sitesec: library
 ms.localizationpriority: medium
 audience: ITPro
 ms.topic: conceptual
@@ -18,7 +14,7 @@ ms.collection:
 - m365-security
 - tier2
 search.appverid: met150
-ms.date: 12/18/2020
+ms.date: 06/29/2023
 ---
 
 # Import, export, and deploy exploit protection configurations
@@ -120,7 +116,7 @@ You can use Group Policy to deploy the configuration you've created to multiple
 
 2. In the **Group Policy Management Editor**, go to **Computer configuration** and select **Administrative templates**.
 
-3. Expand the tree to **Windows components** \> **Windows Defender Exploit Guard** \> **Exploit protection**.
+3. Expand the tree to **Windows components** \> **Microsoft Defender Exploit Guard** \> **Exploit protection**.
 
     :::image type="content" source="../../media/exp-prot-gp.png" alt-text="The group policy setting for exploit protection" lightbox="../../media/exp-prot-gp.png":::