Merge branch 'main' into defender-criteria

Author: denisebmsft

.openpublishing.redirection.defender.json

@@ -6,8 +6,73 @@
         "redirect_document_id": false
     },
     {
+      "source_path": "defender-office-365/zero-trust-continuous-access-evaluation-microsoft-365.md",
+      "redirect_url": "/security/zero-trust/zero-trust-continuous-access-evaluation-microsoft-365",
+      "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-common.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-common",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-exchange.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-exchange",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-guest-access.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-guest-access",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-mcas-saas.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-mcas-saas",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-overview.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-overview",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-prereq.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-prerequisite",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-sharepoint.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-sharepoint",
+     "redirect_document_id": false
+   },
+   {
+     "source_path": "defender-office-365/zero-trust-identity-device-access-policies-teams.md",
+     "redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-teams",
+     "redirect_document_id": false
+   },
+   {
       "source_path": "defender-endpoint/microsoft-defender-antivirus-using-mde-security-set-mngmnt.md",
       "redirect_url": "/defender-endpoint/evaluate-mdav-using-gp",
+      "redirect_document_id": false
+    },
+    {   
+        "source_path": "defender-endpoint/preview.md",
+        "redirect_url": "/defender-xdr/preview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "defender-endpoint/preview-settings.md",
+        "redirect_url": "/defender-xdr/preview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path": "defender-business/mdb-preview.md",
+        "redirect_url": "/defender-xdr/preview",
+        "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-endpoint/evaluation-lab.md",
+      "redirect_url": "/defender-endpoint/evaluate-microsoft-defender-antivirus",
       "redirect_document_id": true
     }
   ]

defender-business/TOC.yml

@@ -10,7 +10,7 @@
     - name: What's new in Defender for Business?
       href: /Microsoft-365/business-premium/m365bp-mdb-whats-new?toc=/defender-business/toc.json&bc=/defender-business/breadcrumb/toc.json
     - name: Preview features
-      href: mdb-preview.md
+      href: /defender-xdr/preview
   - name: Resources for partners
     items:
     - name: Resources for Microsoft partners

defender-business/index.yml

@@ -55,7 +55,7 @@ landingContent:
           - text: See the trial user guide
             url: trial-playbook-defender-business.md
           - text: Turn on preview features
-            url: mdb-preview.md
+            url: /defender-xdr/preview
 
   # Card
   - title: Setup information

defender-business/mdb-attack-disruption.md

@@ -80,5 +80,4 @@ For more information, see [Review remediation actions in the Action center](mdb-
 
 Automatic attack disruption is built into Defender for Business; you don't have to explicitly turn on these capabilities. It's important to [onboard all your organization's devices](mdb-onboard-devices.md) (computers, phones, and tablets) to Defender for Business so that they're protected as soon as possible. 
 
-Additionally, sign up to receive [preview features](mdb-preview.md) so that you get the latest and greatest capabilities as soon as they're available. 
-
+Additionally, sign up to receive [preview features](/defender-xdr/preview) so that you get the latest and greatest capabilities as soon as they're available. 

defender-business/mdb-configure-security-settings.md

@@ -47,7 +47,7 @@ You can view and edit settings for advanced features, such as:
 
 - [Turning on (or off) advanced features](mdb-portal-advanced-feature-settings.md#view-settings-for-advanced-features);
 - [Specifying which time zone to use in the Microsoft Defender portal](mdb-portal-advanced-feature-settings.md#view-and-edit-other-settings-in-the-microsoft-365-defender-portal); and 
-- [Whether to receive preview features as they become available](mdb-preview.md#turn-on-preview-features).
+- [Whether to receive preview features as they become available](/defender-xdr/preview).
 
 ## Choose where to manage security policies and devices
 

defender-business/mdb-portal-advanced-feature-settings.md

@@ -45,7 +45,7 @@ The following table describes advanced feature settings.
 | **Web content filtering**<br/>(turned on by default) | Blocks access to websites that contain unwanted content and tracks web activity across all domains. See [Set up web content filtering](mdb-web-content-filtering.md). |
 | **Microsoft Intune connection**<br/>(we recommend you turn on this setting if you have Intune) | If your organization's subscription includes Microsoft Intune (included in [Microsoft 365 Business Premium resources](/Microsoft-365/business-premium)), this setting enables Defender for Business to share information about devices with Intune.  |
 | **Device discovery**<br/>(turned on by default) | Enables your security team to find unmanaged devices that are connected to your company network. Unknown and unmanaged devices introduce significant risks to your network, whether it's an unpatched printer, a network device with a weak security configuration, or a server with no security controls.<br/><br/>Device discovery uses onboarded devices to discover unmanaged devices, so your security team can onboard the unmanaged devices and reduce your vulnerability. <br/><br/>[Learn more about device discovery](/defender-endpoint/device-discovery).    |
-| **Preview features** | Microsoft is continually updating services such as Defender for Business to include new feature enhancements and capabilities. If you opt in to receive preview features, you'll be among the first to try upcoming features in the preview experience. <br/><br/>[Learn more about preview features](/defender-endpoint/preview).  |
+| **Preview features** | Microsoft is continually updating services such as Defender for Business to include new feature enhancements and capabilities. If you opt in to receive preview features, you'll be among the first to try upcoming features in the preview experience. <br/><br/>[Learn more about preview features](/defender-xdr/preview).  |
 
 <a name='view-and-edit-other-settings-in-the-microsoft-365-defender-portal'></a>
 

defender-business/mdb-preview.md

@@ -17,21 +17,21 @@
     - name: What's new in Defender for Endpoint
       href: whats-new-in-microsoft-defender-endpoint.md
       items: 
-      - name: What's new in Defender for Endpoint - archive
-        href: whats-new-mde-archive.md
-    - name: What's new in Microsoft Defender for Endpoint on Windows
-      href: windows-whatsnew.md
-    - name: What's new in Microsoft Defender for Endpoint on other platforms
-      items:
-      - name: What's new in Defender for Endpoint on Linux
+      - name: MsSense versions (Windows)
+        href: windows-whatsnew.md
+      - name: Defender for Endpoint on macOS releases
+        href: mac-whatsnew.md
+      - name: Defender for Endpoint on Linux releases
         href: linux-whatsnew.md
       - name: What's new in Defender for Endpoint on Android
         href: android-whatsnew.md
       - name: What's new in Defender for Endpoint on iOS
         href: ios-whatsnew.md
+      - name: Previous Defender for Endpoint releases (archive)
+        href: whats-new-mde-archive.md
 
     - name: Preview features
-      href: preview.md
+      href: /defender-xdr/preview
     - name: Data storage and privacy
       href: data-storage-privacy.md
     - name: Defender for Endpoint Plan 1
@@ -44,23 +44,23 @@
         href: mde-plan1-getting-started.md
     - name: Microsoft Defender for Endpoint for US Government customers
       href: gov.md
-    - name: Overview of Microsoft Defender for Endpoint on other platforms
+    - name: Microsoft Defender for Endpoint on other platforms
       href: non-windows.md
       items: 
-      - name: Microsoft Defender for Endpoint on Linux
+      - name: macOS
+        href: microsoft-defender-endpoint-mac.md
+      - name: Linux
         href: microsoft-defender-endpoint-linux.md
-      - name: Microsoft Defender for Endpoint on Android
+      - name: Android
         href: microsoft-defender-endpoint-android.md
-      - name: Microsoft Defender for Endpoint on iOS
+      - name: iOS
         href: microsoft-defender-endpoint-ios.md
 
     - name: Antivirus solution compatibility with Defender for Endpoint
       href: defender-compatibility.md
 
-  - name: Evaluate capabilities
+  - name: Microsoft Defender for Endpoint demonstrations
     items:
-    - name: Evaluate capabilities overview
-      href: evaluation-lab.md
     - name: Microsoft Defender for Endpoint demonstrations
       items:
       - name: Overview
@@ -73,6 +73,8 @@
         href: defender-endpoint-demonstrations.md
       - name: App reputation demonstration
         href: defender-endpoint-demonstration-app-reputation.md
+      - name: Behavior monitoring demonstrations
+        href: demonstration-behavior-monitoring.md
       - name: Validate antimalware
         href: validate-antimalware.md
       - name: Attack surface reduction rules demonstrations
@@ -131,6 +133,8 @@
       items:
       - name: Onboarding Windows Client overview
         href: onboard-windows-client.md
+      - name: Defender for Endpoint plug-in for WSL
+        href: mde-plugin-wsl.md
       - name: Onboard Windows devices to Defender for Endpoint using Intune
         href: configure-endpoints-mdm.md
       - name: Onboard Windows devices to Defender for Endpoint using Microsoft Configuration Manager
@@ -166,10 +170,6 @@
       href: configure-endpoints-non-windows.md
     - name: Defender for Endpoint on macOS
       items:
-      - name: Microsoft Defender for Endpoint on macOS
-        href: microsoft-defender-endpoint-mac.md
-      - name: What's new in Defender for Endpoint on macOS
-        href: mac-whatsnew.md
       - name: Deploy Defender for Endpoint on macOS
         items:
         - name: Deployment with Microsoft Intune
@@ -247,8 +247,6 @@
       items:
        - name: Deploy Defender for Endpoint on Linux
          items:
-         - name: Defender for Endpoint plug-in for WSL
-           href: mde-plugin-wsl.md
          - name: Puppet based deployment
            href: linux-install-with-puppet.md
          - name: Ansible based deployment
@@ -628,6 +626,8 @@
         href: adv-tech-of-mdav.md
       - name: Behavior monitoring with Microsoft Defender Antivirus
         href: behavior-monitor.md
+      - name: Behavior monitoring with Microsoft Defender Antivirus on macOS
+        href: behavior-monitor-macos.md
       - name: Detect and block potentially unwanted applications
         href: detect-block-potentially-unwanted-apps-microsoft-defender-antivirus.md
       - name: Enable and configure Microsoft Defender Antivirus always-on protection in Group Policy

defender-endpoint/TOC.yml

@@ -226,9 +226,13 @@ Helps you find unmanaged devices connected to your corporate network without the
 
 ## Preview features
 
-Learn about new features in the Defender for Endpoint preview release. Try upcoming features by turning on the preview experience.
+Learn about new features in the Defender for Endpoint preview release. 
 
-You'll have access to upcoming features, which you can provide feedback on to help improve the overall experience before features are generally available.
+Try upcoming features by turning on the preview experience. You'll have access to upcoming features, which you can provide feedback on to help improve the overall experience before features are generally available.
+
+If you already have preview features turned on, manage your settings from the main Defender XDR settings. 
+
+For more information, see [Microsoft Defender XDR preview features](/defender-xdr/preview)
 
 ## Download quarantined files
 

defender-endpoint/advanced-features.md

@@ -5,7 +5,7 @@ ms.service: defender-endpoint
 ms.author: siosulli 
 author: siosulli
 ms.localizationpriority: medium 
-ms.date: 02/28/2024
+ms.date: 05/15/2024
 manager: deniseb 
 ms.reviewr: mkaminska
 audience: ITPro 
@@ -48,7 +48,7 @@ Retrieves a list of Microsoft Defender Antivirus device health details. This API
 Data that is collected using either '_JSON response_ or _via files_' is the current snapshot of the current state. It doesn't contain historic data. To collect historic data, customers must save the data in their own data storages.
 
 > [!IMPORTANT]
-> For Windows Server 2012 R2 and Windows Server 2016 to appear in device health reports, these devices must be onboarded using the modern unified solution package. For more information, see [New functionality in the modern unified solution for Windows Server 2012 R2 and 2016](../configure-server-endpoints.md#new-windows-server-2012-r2-and-2016-functionality-in-the-modern-unified-solution).
+> For Windows Server 2012 R2 and Windows Server 2016 to appear in device health reports, these devices must be onboarded using the modern unified solution package. For more information, see [New functionality in the modern unified solution for Windows Server 2012 R2 and 2016](../configure-server-endpoints.md#functionality-in-the-modern-unified-solution).
 >
 > For information about using the **Device health and antivirus compliance** reporting tool in the Microsoft 365 Security dashboard, see: [Device health and antivirus report in Microsoft Defender for Endpoint](../device-health-reports.md).