Merge branch 'master' into MTE_premiereEOD

devices/hololens/hololens-release-notes.md

@@ -20,6 +20,10 @@ appliesto:
 
 # HoloLens 2 release notes
 
+To ensure you have a productive experience with your HoloLens devices, we continue to release feature, bug and security updates. In this page you can learn about what’s new on HoloLens each month. If you would like to download the latest HoloLens 2 FFU to flash your device via [Advanced Recovery Companion](hololens-recovery.md#re-install-the-operating-system) then you may download it from [here](https://aka.ms/hololens2download). This is kept up-to-date and will match the latest generally available build. 
+
+HoloLens Emulator Release Notes can be found [here](https://docs.microsoft.com/windows/mixed-reality/hololens-emulator-archive).
+
 ## Windows Holographic, version 2004 - June 2020 Update
 - Build 19041.1106
 
@@ -80,9 +84,6 @@ We are excited to announce our May 2020 major software update for HoloLens 2, **
 |       Hand Tracking improvements                 |          Hand Tracking improvements make   buttons and 2D slate interactions more accurate                        |
 |       Quality improvements and fixes                 |          Various system performance and   reliability improvements across the platform                            |
 
-> [!Note]
-> HoloLens Emulator Release Notes can be found [here](https://docs.microsoft.com/windows/mixed-reality/hololens-emulator-archive).
-
 ### Support for Windows Autopilot 
 
 Windows Autopilot for HoloLens 2 lets the device sales channel pre-enroll HoloLens into your Intune tenant.  When devices arrive, they’re ready to self-deploy as shared devices under your tenant. To take advantage of self-deployment, devices will need to connect to a network during the first screen in setup using either a USB-C to ethernet dongle or USB-C to LTE dongle. 

devices/surface-hub/hub-teams-app.md

@@ -21,4 +21,4 @@ The Microsoft Teams app for Surface Hub is periodically updated and available vi
 | --------------------- | --------------------------------------------------------------------------------------------------- | -------------------------------- |
 | 0.2020.13201.0        | - 3x3 Gallery view on Surface Hub<br>- Ability to search for External users                         | June 10, 2020<br>            |
 | 0.2020.13201          | - Quality improvements and Bug fixes                                                                | June 1, 2020<br>          |
-| 0.2020.4301.0         | - Accept incoming PSTN calls on Surface Hub<br>- Added controls for Attendee/Presenter role changes | May 21, 2020                     |
+| 0.2020.4301.0         | - Accept incoming PSTN calls on Surface Hub<br>- Consume Attendee/Presenter role changes            | May 21, 2020                     |

devices/surface-hub/index.yml

@@ -1,127 +1,105 @@
-### YamlMime:Hub
+### YamlMime:Landing
 
 title: Surface Hub documentation # < 60 chars
 summary: Surface Hub 2S is an all-in-one digital interactive whiteboard, meetings platform, and collaborative computing device. # < 160 chars
-# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-bi | power-platform | sql | sql-server | vs | visual-studio | windows | xamarin
-brand: windows
 
 metadata:
   title: Surface Hub documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
-  description: Get started with Microsoft Surface Hub. # Required; article description that is displayed in search results. < 160 chars.
+  description: Get started with Microsoft Surface Hub # Required; article description that is displayed in search results. < 160 chars.
-  services: product-insights
   ms.service: product-insights #Required; service per approved list. service slug assigned to your service by ACOM.
-  ms.topic: hub-page # Required
+  ms.topic: landing-page # Required
-  ms.prod: surface-hub
+  manager: laurawi
-  ms.technology: windows
-  audience: ITPro
-  ms.localizationpriority: medium
   author: greg-lindsay #Required; your GitHub user alias, with correct capitalization.
   ms.author: greglin #Required; microsoft alias of author; optional team alias.
-  manager: laurawi
+  audience: itpro
+  ms.localizationpriority: High
 
-# highlightedContent section (optional)
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
-# Maximum of 8 items
-highlightedContent:
-# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
-  items:
-    # Card
-    - title: What's new in Surface Hub 2S?
-      itemType: whats-new
-      url: surface-hub-2s-whats-new.md
-     # Card
-    - title: Surface Hub security overview 
-      itemType: learn
-      url: surface-hub-security.md
-   # Card
-    - title: Manage Surface Hub 2S with Intune
-      itemType: how-to-guide
-      url: surface-hub-2s-manage-intune.md
-    # Card
-    - title: Operating system essentials
-      itemType: learn
-      url: differences-between-surface-hub-and-windows-10-enterprise.md
-    # Card
-    - title: Surface Hub 2S Site Readiness Guide
-      itemType: learn
-      url: surface-hub-2s-site-readiness-guide.md
-    # Card
-    - title: Customize Surface Hub 2S installation
-      itemType: how-to-guide
-      url: surface-hub-2s-custom-install.md
 
-# productDirectory section (optional)
+landingContent:
-productDirectory:
+# Cards and links should be based on top customer tasks or top subjects
-  title: Deploy, manage, and support your Surface Hub devices # < 60 chars (optional)
+# Start card title with a verb
-  summary: Find related links to deploy, manage and support your Surface Hub devices. # < 160 chars (optional)
+  # Card (optional)
-  items:
+  - title: Surface devices
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: What's new in Surface Hub 2S?
+            url: surface-hub-2s-whats-new.md
+          - text: Surface Hub 2S tech specs
+            url:  surface-hub-2s-techspecs.md
+          - text: Operating system essentials
+            url: differences-between-surface-hub-and-windows-10-enterprise.md
+  
+  # Card (optional)
+  - title: Get started
+    linkLists:
+      - linkListType: get-started
+        links:
+         - text: Surface Hub 2S Site Readiness Guide
+           url: surface-hub-2s-site-readiness-guide.md
+         - text: Customize Surface Hub 2S installation
+           url: surface-hub-2s-custom-install.md
+         - text: Prepare your environment for Surface Hub 2S
+           url: surface-hub-2s-prepare-environment.md  
+ 
+  # Card
+  - title: Deploy Surface Hub
+    linkLists:
+      - linkListType: deploy
+        links:
+          - text: Surface Hub 2S adoption and training
+            url: surface-hub-2s-adoption-kit.md
+          - text: Surface Hub 2S deployment checklist
+            url: surface-hub-2s-deploy-checklist.md
+          - text: Create device account
+            url: surface-hub-2s-account.md
+  
     # Card
-    - title: Deploy
+  - title: Manage Surface devices
-      # imageSrc should be square in ratio with no whitespace
+    linkLists:
-      imageSrc: https://docs.microsoft.com/office/media/icons/deploy-blue.svg
+      - linkListType: how-to-guide
-      links:
+        links:
-        - url: surface-hub-2s-adoption-kit.md
+          - text: Manage Surface Hub 2S with Intune
-          text: Surface Hub 2S adoption and training
+            url: surface-hub-2s-manage-intune.md
-        - url: surface-hub-2s-deploy-checklist.md
+          - text: Manage local settings
-          text: Surface Hub 2S deployment checklist
+            url: local-management-surface-hub-settings.md
-        - url: surface-hub-2s-account.md
+          - text: Manage Windows updates on Surface Hub
-          text: Create device account
+            url: manage-windows-updates-for-surface-hub.md
-    # Card
-    - title: Manage
-      imageSrc: https://docs.microsoft.com/office/media/icons/process-flow-blue.svg
-      links:
-        - url: surface-hub-2s-manage-intune.md
-          text: Manage with Intune
-        - url: local-management-surface-hub-settings.md
-          text: Manage local settings
-    # Card
-    - title: Secure
-      imageSrc: https://docs.microsoft.com/office/media/icons/security-blue.svg
-      links:
-        - url: surface-hub-2s-secure-with-uefi-semm.md
-          text: Secure with UEFI and SEMM
-        - url: surface-hub-wifi-direct.md
-          text: Wi-Fi security considerations
-    # Card
-    - title:  Troubleshoot
-      imageSrc: https://docs.microsoft.com/office/media/icons/connector-blue.svg
-      links:
-        - url: https://support.microsoft.com/help/4493926
-          text: Service and warranty
-        - url: surface-hub-2s-recover-reset.md
-          text: Recover & reset Surface Hub 2S
-        - url: support-solutions-surface-hub.md
-          text: Surface Hub support solutions
-        - url: https://support.office.com/article/Enable-Microsoft-Whiteboard-on-Surface-Hub-b5df4539-f735-42ff-b22a-0f5e21be7627
-          text: Enable Microsoft Whiteboard on Surface Hub
 
-# additionalContent section (optional)
+  # Card
-# Card with links style
+  - title: Explore security guidance
-additionalContent:
+    linkLists:
-  # Supports up to 3 sections
+      - linkListType: learn
-  sections:
+        links:
-    - title: Other content # < 60 chars (optional)
+          - text: Secure and manage Surface Hub 2S with SEMM and UEFI
-      summary: Find related links for videos, community and support. # < 160 chars (optional)
+            url: surface-hub-2s-secure-with-uefi-semm.md
-      items:
+          - text: Wi-Fi security considerations
-        # Card
+            url: surface-hub-wifi-direct.md
-        - title: Get ready for Surface Hub 2S
+          - text: Surface Hub security overview
-          links:
+            url:  surface-hub-security.md
-            - text: Ordering Surface Hub 2S
+ 
-              url: https://www.microsoft.com/p/surface-hub-2S/8P62MW6BN9G4?activetab=pivot:overviewtab
+ # Card
-            - text: Prepare your environment for Surface Hub 2S
+  - title: Troubleshoot Surface Hub
-              url: surface-hub-2s-prepare-environment.md
+    linkLists:
-        # Card
+      - linkListType: learn
-        - title: Surface Hub 2S Videos
+        links:
-          links:
+          - text: Service and warranty
-            - text: Adoption and training videos
+            url: https://support.microsoft.com/help/4493926
-              url: surface-hub-2s-adoption-videos.md
+          - text: Recover & reset Surface Hub 2S
-            - text: Surface Hub 2S with Teams
+            url: surface-hub-2s-recover-reset.md
-              url: https://www.youtube.com/watch?v=CH2seLS5Wb0
+          - text: Surface Hub support solutions
-            - text: Surface Hub 2S with Microsoft 365
+            url: support-solutions-surface-hub.md 
-              url: https://www.youtube.com/watch?v=I4N2lQX4WyI&list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ&index=7
+
-        # Card
+
-        - title: Community
+# Card
-          links:
+  - title: Surface Hub 2S Videos
-            - text: Join the Surface Hub Technical Community
+    linkLists:
-              url: https://techcommunity.microsoft.com/t5/Surface-Hub/bd-p/SurfaceHub
+      - linkListType: video
-            - text: Join the Surface Devices Technical Community
+        links:
-              url: https://techcommunity.microsoft.com/t5/Surface-Devices/ct-p/SurfaceDevices
+          - text: Adoption and training videos
+            url: surface-hub-2s-adoption-videos.md
+          - text: Surface Hub 2S with Teams
+            url: https://www.youtube.com/watch?v=CH2seLS5Wb0
+          - text:  Surface Hub 2S with Microsoft 365
+            url: https://www.youtube.com/watch?v=I4N2lQX4WyI&list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ&index=7

devices/surface-hub/surface-hub-2s-adoption-videos.md

@@ -9,7 +9,6 @@ ms.author: greglin
 manager: laurawi
 audience: Admin
 ms.topic: article
-ms.date: 11/04/2019
 ms.localizationpriority: Medium
 ---
 
@@ -19,7 +18,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 1 - Training overview
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46Jud>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46Jud] 
 
 - Welcome and introduction
 - Training overview and agenda
@@ -31,7 +30,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 2 - Getting started with Surface Hub
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46Ejt>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46Ejt] 
 
 - What is Surface Hub?
 - Technical overview
@@ -42,7 +41,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 3 - Navigating Surface Hub
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46OFW>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46OFW] 
 
 - Welcome screen
 - Start menu
@@ -54,7 +53,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 4 - Whiteboarding and collaboration
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46M4v>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46M4v] 
 
 - Whiteboard introduction
 - Starting the Whiteboard
@@ -66,7 +65,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
  
 ## Chapter 5 - Exploring Surface Hub apps
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46Ejz>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46Ejz] 
 
 - Surface Hub apps introduction
 - PowerPoint overview
@@ -76,7 +75,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 6 - Advanced apps and Office 365
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46EjA>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46EjA] 
 
 - Advanced apps introduction
 - Microsoft Maps
@@ -88,7 +87,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 7 - Connecting devices
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46M4w>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46M4w] 
 
 - Connect introduction
 - Miracast overview
@@ -99,7 +98,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
  
 ## Chapter 8 - Skype for Business meetings
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46M4x>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46M4x] 
 
 - Introduction to Skype for Business
 -Scheduling Skype for Business meetings
@@ -111,7 +110,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 	
 ## Chapter 9 - Microsoft Teams meetings
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46OFZ>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46OFZ] 
 
 - Introduction to Microsoft Teams
 - Scheduling Microsoft Teams meetings
@@ -124,7 +123,7 @@ This page contains comprehensive training for Surface Hub 2S, available on deman
 
 ## Chapter 10 - Basic troubleshooting
 
-> ![VIDEO <https://www.microsoft.com/videoplayer/embed/RE46z65>]<br>
+> [!video https://www.microsoft.com/videoplayer/embed/RE46z65] 
 
 - Introduction to Surface Hub troubleshooting
 - Application troubleshooting

windows/configuration/set-up-shared-or-guest-pc.md

@@ -9,7 +9,6 @@ author: dansimp
 ms.author: dansimp
 ms.topic: article
 ms.localizationpriority: medium
-ms.date: 10/02/2018
 ms.reviewer: 
 manager: dansimp
 ---
@@ -93,20 +92,20 @@ You can configure Windows to be in shared PC mode in a couple different ways:
   5. From the **Platform** menu, select **Windows 10 and later**.
   6. From the **Profile** menu, select **Shared multi-user device**.
 
-     ![custom OMA-URI policy in Intune](images/Shared_PC_1.png) 
+     ![custom OMA-URI policy in Intune](images/shared_pc_1.jpg) 
 
   7. Select **Create**.
   8. Enter a name for the policy (e.g. My Win10 Shared devices policy). You can optionally add a description should you wish to do so.
   9. Select **Next**.
   10. On the **Configuration settings** page, set the ‘Shared PC Mode’ value to **Enabled**.
 
-     ![Shared PC settings in ICD](images/Shared_PC_3.png) 
+     ![Shared PC settings in ICD](images/shared_pc_3.png) 
 
   11. From this point on, you can configure any additional settings you’d like to be part of this policy, and then follow the rest of the set-up flow to its completion by selecting **Create** after **Step 6**.
 
 - A provisioning package created with the Windows Configuration Designer: You can apply a provisioning package when you initially set up the PC (also known as the out-of-box-experience or OOBE), or you can apply the provisioning package to a Windows 10 PC that is already in use. The provisioning package is created in Windows Configuration Designer. Shared PC mode is enabled by the [SharedPC configuration service provider (CSP)](https://docs.microsoft.com/windows/client-management/mdm/sharedpc-csp), exposed in Windows Configuration Designer as **SharedPC**.
 
-     ![Shared PC settings in ICD](images/icd-adv-shared-pc.PNG)
+     ![Shared PC settings in ICD](images/icd-adv-shared-pc.png)
 
 - WMI bridge: Environments that use Group Policy can use the [MDM Bridge WMI Provider](https://msdn.microsoft.com/library/windows/desktop/dn905224.aspx) to configure the [MDM_SharedPC class](https://msdn.microsoft.com/library/windows/desktop/mt779129.aspx). For all device settings, the WMI Bridge client must be executed under local system user; for more information, see [Using PowerShell scripting with the WMI Bridge Provider](https://docs.microsoft.com/windows/client-management/mdm/using-powershell-scripting-with-the-wmi-bridge-provider). For example, open PowerShell as an administrator and enter the following:
 

windows/deployment/TOC.yml

@@ -11,8 +11,8 @@
           href: update/waas-quick-start.md
         - name: Windows update fundamentals
           href: update/waas-overview.md
-        - name: Types of Windows updates
+        - name: Basics of Windows updates, channels, and tools
-          href: update/waas-quick-start.md#definitions
+          href: update/get-started-updates-channels-tools.md
         - name: Servicing the Windows 10 operating system
           href: update/waas-servicing-strategy-windows-10-updates.md
 
@@ -42,7 +42,7 @@
         - name: Determine application readiness
           href: update/plan-determine-app-readiness.md 
         - name: Define your servicing strategy
-          href: update/waas-servicing-strategy-windows-10-updates.md
+          href: update/plan-define-strategy.md
         - name: Best practices for feature updates on mission-critical devices
           href: update/feature-update-mission-critical.md
         - name: Windows 10 deployment considerations
@@ -62,8 +62,8 @@
 
     - name: Prepare
       items: 
-        - name: Prepare to deploy Windows 10
+        - name: Prepare to deploy Windows 10 updates
-          href: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md 
+          href: update/prepare-deploy-windows.md
         - name: Evaluate and update infrastructure
           href: update/update-policies.md 
         - name: Set up Delivery Optimization for Windows 10 updates
@@ -165,8 +165,10 @@
           items:
             - name: Monitor Delivery Optimization
               href: update/waas-delivery-optimization-setup.md#monitor-delivery-optimization
-            - name: Monitor Windows Updates with Update Compliance
+            - name: Monitor Windows Updates
               items:
+              - name: Monitor Windows Updates with Update Compliance
+                href: update/update-compliance-monitor.md
               - name: Get started
                 items: 
                   - name: Get started with Update Compliance
@@ -238,6 +240,8 @@
       items:
         - name: How does Windows Update work?
           href: update/how-windows-update-works.md
+        - name: Deploy Windows 10 with Microsoft 365
+          href: deploy-m365.md
         - name: Understanding the Unified Update Platform
           href: update/windows-update-overview.md
         - name: Servicing stack updates

windows/deployment/deploy-m365.md

@@ -50,8 +50,8 @@ You can check out the Microsoft 365 deployment advisor and other resources for f
 >If you have not run a setup guide before, you will see the **Prepare your environment** guide first. This is to make sure you have basics covered like domain verification and a method for adding users. At the end of the "Prepare your environment" guide, there will be a **Ready to continue** button that sends you to the original guide that was selected.
 
 1. [Obtain a free M365 trial](https://docs.microsoft.com/office365/admin/try-or-buy-microsoft-365).
-2. Check out the [Microsoft 365 deployment advisor](https://portal.office.com/onboarding/Microsoft365DeploymentAdvisor#/).
+2. Check out the [Microsoft 365 deployment advisor](https://aka.ms/microsoft365setupguide).
-3. Also check out the [Windows Analytics deployment advisor](https://portal.office.com/onboarding/WindowsAnalyticsDeploymentAdvisor#/). This advisor will walk you through deploying [Upgrade Readiness](https://docs.microsoft.com/windows/deployment/upgrade/manage-windows-upgrades-with-upgrade-readiness), [Update Compliance](https://docs.microsoft.com/windows/deployment/update/update-compliance-monitor), and [Device Health](https://docs.microsoft.com/windows/deployment/update/device-health-monitor). 
+3. Also check out the [Windows Analytics deployment advisor](https://aka.ms/windowsanalyticssetupguide). This advisor will walk you through deploying [Desktop Analytics](https://docs.microsoft.com/mem/configmgr/desktop-analytics/overview). 
 
 That's all there is to it! 
 

windows/deployment/update/get-started-updates-channels-tools.md

@@ -47,7 +47,7 @@ The first step of controlling when and how devices install updates is assigning
 
 ### Semi-annual Channel
 
-In the Semi-annual Channel, feature updates are available as soon as Microsoft releases them, twice per year. As long as a device isn't set to defer feature updates, any device using the Semi-annual Channel will install a feature update as soon as it's released. If you use Windows Update for Business, the Semi-annual Channel provides three months of additional total deployment time before being required to update to the next release.{IS THIS STILL TRUE?}
+In the Semi-annual Channel, feature updates are available as soon as Microsoft releases them, twice per year. As long as a device isn't set to defer feature updates, any device using the Semi-annual Channel will install a feature update as soon as it's released. If you use Windows Update for Business, the Semi-annual Channel provides three months of additional total deployment time before being required to update to the next release.
 
 > [!NOTE]
 > All releases of Windows 10 have **18 months of servicing for all editions**--these updates provide security and feature updates for the release. However, fall releases of the **Enterprise and Education editions** will have an **additional 12 months of servicing for specific Windows 10 releases, for a total of 30 months from initial release**. This extended servicing window applies to Enterprise and Education editions starting with Windows 10, version 1607.

windows/deployment/update/plan-define-strategy.md

@@ -0,0 +1,49 @@
+---
+title: Define update strategy
+description: Two examples of a calendar-based approach to consistent update installation
+keywords: updates, servicing, current, deployment, semi-annual channel, feature, quality, rings, tools
+ms.prod: w10
+ms.mktglfcycl: manage
+author: jaimeo
+ms.localizationpriority: medium
+ms.author: jaimeo
+ms.reviewer: 
+manager: laurawi
+ms.topic: article
+---
+
+# Define update strategy with a calendar
+
+Traditionally, organizations treated the deployment of operating system updates (especially feature updates) as a discrete project that had a beginning, a middle, and an end. A release was "built" (usually in the form of an image) and then distributed to users and their devices.
+
+Today, more organizations are treating deployment as a continual process of updates which roll out across the organization in waves. In this approach, an update is plugged into this process and while it runs, you monitor for anomalies, errors, or user impact and respond as issues arise--without interrupting the entire process. Microsoft has been evolving its Windows 10 release cycles, update mechanisms, and relevant tools to support this model. Feature updates are released twice per year, around March and September. All releases of Windows 10 have 18 months of servicing for all editions. Fall releases of the Enterprise and Education editions have an additional 12 months of servicing for specific Windows 10 releases, for a total of 30 months from initial release.
+
+Though we encourage you to deploy every available release and maintain a fast cadence for some portion of your environment, we also recognize that you might have a large number of devices, and a need for little or no disruption, an so you might choose to update annually. The 18/30 month lifecycle cadence lets you to allow some portion of you environment to move faster while a majority can move less quickly.
+
+## Calendar approaches
+You can use a calendar approach for either a faster twice-per-year cadence or an annual cadence. Depending on company size, installing Windows 10 feature updates less often than once annually risks devices going out of service and becoming vulnerable to security threats, because they will stop receiving the monthly security updates.
+
+### Annual
+Here's a calendar showing an example schedule that applies one Windows 10 feature update per calendar year, aligned with Microsoft Endpoint Configuration Manager and Microsoft 365 Apps release cycles:
+
+![Calendar showing an annual update cadence](images/annual-calendar.png)
+
+This approach provides approximately twelve months of use from each feature update before the next update is due to be installed. By aligning to the Windows 10, version H2 feature update, each release will be serviced for 30 months from the time of availability, giving you more flexibility when applying future feature updates.
+
+This cadence might be most suitable for you if any of these conditions apply:
+
+- You are just starting your journey with the Windows 10 servicing process. If you are unfamiliar with new processes that support Windows 10 servicing, moving from a once every 3-5 year project to a twice a year feature update process can be daunting. This approach gives you time to learn new approaches and tools to reduce effort and cost.
+- You want to wait and see how successful other companies are at adopting a Windows 10 feature update.
+- You want to go quickly with feature updates, and want the ability to skip a feature update while keeping Windows 10 serviced in case business priorities change. Aligning to the Windows 10 feature update released in the second half of each calendar year, you get additional servicing for Windows 10 (30 months of servicing compared to 18 months).
+
+### Rapid
+This calendar shows an example schedule that installs each feature update as it is released, twice per year:
+
+![Update calendar showing a faster update cadence](images/rapid-calendar.png)
+
+This cadence might be best for you if these conditions apply:
+
+- You have a strong appetite for change.
+- You want to continuously update supporting infrastructure and unlock new scenarios.
+- Your organization has a large population of information workers that can use the latest features and functionality in Windows 10 and Office.
+- You have experience with feature updates for Windows 10.

windows/deployment/vda-subscription-activation.md

@@ -66,28 +66,26 @@ For examples of activation issues, see [Troubleshoot the user experience](https:
 4. On the Remote tab, choose **Allow remote connections to this computer** and then click **Select Users**.
 5. Click **Add**, type **Authenticated users**, and then click **OK** three times.
 6. Follow the instructions to use sysprep at [Steps to generalize a VHD](https://docs.microsoft.com/azure/virtual-machines/windows/prepare-for-upload-vhd-image#steps-to-generalize-a-vhd) and then start the VM again.
-7. [Install Windows Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd).
+7. If you must activate Windows 10 Pro as described for [scenario 3](#scenario-3), complete the following steps to use Windows Configuration Designer and inject an activation key. Otherwise, skip to step 20.
-8. Open Windows Configuration Designer and click **Provison desktop services**.
+8. [Install Windows Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd).
-9. If you must activate Windows 10 Pro as described for [scenario 3](#scenario-3), complete the following steps. Otherwise, skip to step 10.
+9. Open Windows Configuration Designer and click **Provison desktop services**.
-
+10. Under **Name**, type **Desktop AD Enrollment Pro GVLK**, click **Finish**, and then on the **Set up device** page enter a device name.
-    1. Under **Name**, type **Desktop AD Enrollment Pro GVLK**, click **Finish**, and then on the **Set up device** page enter a device name.
         - Note: You can use a different project name, but this name is also used with dism.exe in a subsequent step.
-    2. Under **Enter product key** type the Pro GVLK key: **W269N-WFGWX-YVC9B-4J6C9-T83GX**.
+11. Under **Enter product key** type the Pro GVLK key: **W269N-WFGWX-YVC9B-4J6C9-T83GX**.
-10. On the Set up network page, choose **Off**.
+12. On the Set up network page, choose **Off**.
-11. On the Account Management page, choose **Enroll into Active Directory** and then enter the account details.
+13. On the Account Management page, choose **Enroll into Active Directory** and then enter the account details.
     - Note: This step is different for [Azure AD-joined VMs](#azure-active-directory-joined-vms).
-12. On the Add applications page, add applications if desired. This step is optional.
+14. On the Add applications page, add applications if desired. This step is optional.
-13. On the Add certificates page, add certificates if desired. This step is optional.
+15. On the Add certificates page, add certificates if desired. This step is optional.
-14. On the Finish page, click **Create**.
+16. On the Finish page, click **Create**.
-15. If you must activate Windows 10 Pro as described for [scenario 3](#scenario-3), complete the following steps. Otherwise, skip to step 16.
+17. In file explorer, double-click the VHD to mount the disk image. Determine the drive letter of the mounted image.
-    1. In file explorer, double-click the VHD to mount the disk image. Determine the drive letter of the mounted image.
+18. Type the following at an elevated command prompt. Replace the letter **G** with the drive letter of the mounted image, and enter the project name you used if it is different than the one suggested:
-    2. Type the following at an elevated commnand prompt. Replace the letter **G** with the drive letter of the mounted image, and enter the project name you used if it is different than the one suggested:
 
-    ```
+    ```cmd
     Dism.exe /Image=G:\ /Add-ProvisioningPackage /PackagePath: "Desktop AD Enrollment Pro GVLK.ppkg"
     ```
-    3. Right-click the mounted image in file explorer and click **Eject**.
+19. Right-click the mounted image in file explorer and click **Eject**.
-16. See instructions at [Upload and create VM from generalized VHD](https://docs.microsoft.com/azure/virtual-machines/windows/upload-generalized-managed#log-in-to-azure) to log in to Azure, get your storage account details, upload the VHD, and create a managed image.
+20. See instructions at [Upload and create VM from generalized VHD](https://docs.microsoft.com/azure/virtual-machines/windows/upload-generalized-managed#log-in-to-azure) to log in to Azure, get your storage account details, upload the VHD, and create a managed image.
 
 ## Azure Active Directory-joined VMs
 

windows/deployment/windows-autopilot/policy-conflicts.md

@@ -23,13 +23,18 @@ ms.topic: article
 
 - Windows 10
 
-There are a sigificant number of policy settings available for Windows 10, both as native MDM policies and group policy (ADMX-backed) settings. Some of these can cause issues in certain Windows Autopilot scenarios as a result of how they change the behavior of Windows 10. If you encounter any of these issues, remove the policy in question to resolve the issue.
+There are a significant number of policy settings available for Windows 10, both as native MDM policies and group policy (ADMX-backed) settings. Some of these can cause issues in certain Windows Autopilot scenarios as a result of how they change the behavior of Windows 10. If you encounter any of these issues, remove the policy in question to resolve the issue.
 
 <table>
 <th>Policy<th>More information
 
-<tr><td width="50%">Device restriction / <a href="https://docs.microsoft.com/partner-center/regional-authorization-overview">Password policy</a>
+<tr><td width="50%">Device restriction / <a href="https://docs.microsoft.com/windows/client-management/mdm/devicelock-csp">Password Policy</a></td>
-<td>When certain <a href="https://docs.microsoft.com/windows/client-management/mdm/policy-csp-devicelock">DeviceLock policies</a>, such as minimum password length and password complexity, or any similar group policy settings, including any that disable auto-logon, are applied to a device, and that device reboots during the device Enrollment Status Page (ESP), the out-of-box experience or user desktop auto-logon could fail unexpectantly.
+<td>When certain <a href="https://docs.microsoft.com/windows/client-management/mdm/policy-csp-devicelock">DeviceLock policies</a>, such as minimum password length and password complexity, or any similar group policy settings, including any that disable auto-logon, are applied to a device, and that device reboots during the device Enrollment Status Page (ESP), the out-of-box experience or user desktop auto-logon could fail unexpectantly.  This is especially true for kiosk scenarios where passwords are automatically generated.</td>
+
+<tr><td width="50%">Windows 10 Security Baseline / <a href="https://docs.microsoft.com/windows/client-management/mdm/policy-csp-localpoliciessecurityoptions">Administrator elevation prompt behavior</a>
+<br>Windows 10 Security Baseline / <a href="https://docs.microsoft.com/windows/client-management/mdm/policy-csp-localpoliciessecurityoptions">Require admin approval mode for administrators</a></td>
+<td>When modifying user account control (UAC) settings during the out-of-box experience (OOBE) using device Enrollment Status Page (ESP), additional UAC prompts may result, especially if the device reboots after these policies are applied enabling them to take effect.  To work around this issue, the policies can be targeted to users instead of devices so that they apply later in the process.</td>
+
 </table>
 
 ## Related topics

windows/security/threat-protection/microsoft-defender-atp/linux-exclusions.md

@@ -64,7 +64,7 @@ For more information on how to configure exclusions from Puppet, Ansible, or ano
 Run the following command to see the available switches for managing exclusions:
 
 ```bash
-$ mdatp --exclusion
+$ mdatp exclusion
 ```
 
 Examples:
@@ -72,29 +72,29 @@ Examples:
 - Add an exclusion for a file extension:
 
     ```bash
-    $ mdatp --exclusion --add-extension .txt
+    $ mdatp exclusion extension add --name .txt
-    Configuration updated successfully
+    Extension exclusion configured successfully
     ```
 
 - Add an exclusion for a file:
 
     ```bash
-    $ mdatp --exclusion --add-folder /var/log/dummy.log
+    $ mdatp exclusion file add --path /var/log/dummy.log
-    Configuration updated successfully
+    File exclusion configured successfully
     ```
 
 - Add an exclusion for a folder:
 
     ```bash
-    $ mdatp --exclusion --add-folder /var/log/
+    $ mdatp exclusion folder add --path /var/log/
-    Configuration updated successfully
+    Folder exclusion configured successfully
     ```
 
 - Add an exclusion for a process:
 
     ```bash
-    $ mdatp --exclusion --add-process cat
+    $ mdatp exclusion process add --name cat
-    Configuration updated successfully
+    Process exclusion configured successfully
     ```
 
 ## Validate exclusions lists with the EICAR test file

windows/security/threat-protection/microsoft-defender-atp/linux-install-manually.md

@@ -268,7 +268,7 @@ Download the onboarding package from Microsoft Defender Security Center:
     Initially the client machine is not associated with an organization. Note that the *orgId* attribute is blank:
 
     ```bash
-    mdatp --health orgId
+    mdatp health --field org_id
     ```
 
 2. Run MicrosoftDefenderATPOnboardingLinuxServer.py, and note that, in order to run this command, you must have `python` installed on the device:
@@ -280,17 +280,20 @@ Download the onboarding package from Microsoft Defender Security Center:
 3. Verify that the machine is now associated with your organization and reports a valid organization identifier:
 
     ```bash
-    mdatp --health orgId
+    mdatp health --field org_id
     ```
 
 4. A few minutes after you complete the installation, you can see the status by running the following command. A return value of `1` denotes that the product is functioning as expected:
 
     ```bash
-    mdatp --health healthy
+    mdatp health --field healthy
     ```
 
     > [!IMPORTANT]
-    > When the product starts for the first time, it downloads the latest antimalware definitions. Depending on your Internet connection, this can take up to a few minutes. During this time the above command returns a value of `0`.<br>
+    > When the product starts for the first time, it downloads the latest antimalware definitions. Depending on your Internet connection, this can take up to a few minutes. During this time the above command returns a value of `false`. You can check the status of the definition update using the following command:
+    > ```bash
+    > mdatp health --field definitions_status
+    > ```
     > Please note that you may also need to configure a proxy after completing the initial installation. See [Configure Microsoft Defender ATP for Linux for static proxy discovery: Post-installation configuration](https://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-atp/linux-static-proxy-configuration#post-installation-configuration).
 
 5. Run a detection test to verify that the machine is properly onboarded and reporting to the service. Perform the following steps on the newly onboarded machine:
@@ -298,7 +301,7 @@ Download the onboarding package from Microsoft Defender Security Center:
     - Ensure that real-time protection is enabled (denoted by a result of `1` from running the following command):
 
         ```bash
-        mdatp --health realTimeProtectionEnabled
+        mdatp health --field real_time_protection_enabled
         ```
 
     - Open a Terminal window. Copy and execute the following command:
@@ -310,7 +313,7 @@ Download the onboarding package from Microsoft Defender Security Center:
     - The file should have been quarantined by Microsoft Defender ATP for Linux. Use the following command to list all the detected threats:
 
         ```bash
-        mdatp --threat --list --pretty
+        mdatp threat list
         ```
 
 ## Log installation issues

windows/security/threat-protection/microsoft-defender-atp/linux-install-with-ansible.md

@@ -149,31 +149,31 @@ Create subtask or role files that contribute to an actual task. First create the
     > [!NOTE]
     > In case of Oracle Linux, replace *[distro]* with “rhel”.
 
-        ```bash
+  ```bash
-        - name: Add Microsoft apt repository for MDATP
+  - name: Add Microsoft apt repository for MDATP
-            apt_repository:
+      apt_repository:
-                repo: deb [arch=arm64,armhf,amd64] https://packages.microsoft.com/[distro]/[version]/prod [channel] main
+          repo: deb [arch=arm64,armhf,amd64] https://packages.microsoft.com/[distro]/[version]/prod [channel] main
-                update_cache: yes
+          update_cache: yes
-                state: present
+          state: present
-                filename: microsoft-[channel].list
+          filename: microsoft-[channel].list
-            when: ansible_os_family == "Debian"
+      when: ansible_os_family == "Debian"
 
-        - name: Add Microsoft APT key
+  - name: Add Microsoft APT key
-            apt_key:
+      apt_key:
-                keyserver: https://packages.microsoft.com/
+          keyserver: https://packages.microsoft.com/
-                id: BC528686B50D79E339D3721CEB3E94ADBE1229CF
+          id: BC528686B50D79E339D3721CEB3E94ADBE1229CF
-            when: ansible_os_family == "Debian"
+      when: ansible_os_family == "Debian"
 
-        - name: Add  Microsoft yum repository for MDATP
+  - name: Add  Microsoft yum repository for MDATP
-            yum_repository:
+      yum_repository:
-                name: packages-microsoft-com-prod-[channel]
+          name: packages-microsoft-com-prod-[channel]
-                description: Microsoft Defender ATP
+          description: Microsoft Defender ATP
-                file: microsoft-[channel]
+          file: microsoft-[channel]
-                baseurl: https://packages.microsoft.com/[distro]/[version]/[channel]/
+          baseurl: https://packages.microsoft.com/[distro]/[version]/[channel]/
-                gpgcheck: yes
+          gpgcheck: yes
-                enabled: Yes
+          enabled: Yes
-            when: ansible_os_family == "RedHat"
+      when: ansible_os_family == "RedHat"
-        ```
+  ```
 
 - Create the actual install/uninstall YAML files under `/etc/ansible/playbooks`.
 
@@ -241,8 +241,8 @@ Now run the tasks files under `/etc/ansible/playbooks/`.
 - Validation/configuration:
 
     ```bash
-    $ ansible -m shell -a 'mdatp --connectivity-test' all
+    $ ansible -m shell -a 'mdatp connectivity test' all
-    $ ansible -m shell -a 'mdatp --health' all
+    $ ansible -m shell -a 'mdatp health' all
     ```
 
 - Uninstallation:

windows/security/threat-protection/microsoft-defender-atp/linux-install-with-puppet.md

@@ -174,10 +174,10 @@ Enrolled agent devices periodically poll the Puppet Server, and install new conf
 On the agent machine, you can also check the onboarding status by running:
 
 ```bash
-$ mdatp --health
+$ mdatp health
 ...
 licensed                                : true
-orgId                                   : "[your organization identifier]"
+org_id                                  : "[your organization identifier]"
 ...
 ```
 
@@ -190,7 +190,7 @@ orgId                                   : "[your organization identifier]"
 You can check that devices have been correctly onboarded by creating a script. For example, the following script checks enrolled devices for onboarding status:
 
 ```bash
-mdatp --health healthy
+mdatp health --field healthy
 ```
 
 The above command prints `1` if the product is onboarded and functioning as expected.

windows/security/threat-protection/microsoft-defender-atp/linux-preferences.md

@@ -247,13 +247,17 @@ Diagnostic data is used to keep Microsoft Defender ATP secure and up-to-date, de
 
 #### Enable / disable automatic sample submissions
 
-Determines whether suspicious samples (that are likely to contain threats) are sent to Microsoft. You are prompted if the submitted file is likely to contain personal information.
+Determines whether suspicious samples (that are likely to contain threats) are sent to Microsoft. There are three levels for controlling sample submission:
+
+- **None**: no suspicious samples are submitted to Microsoft.
+- **Safe**: only suspicious samples that do not contain personally identifiable information (PII) are submitted automatically. This is the default value for this setting.
+- **All**: all suspicious samples are submitted to Microsoft.
 
 |||
 |:---|:---|
-| **Key** | automaticSampleSubmission |
+| **Key** | automaticSampleSubmissionConsent |
-| **Data type** | Boolean |
+| **Data type** | String |
-| **Possible values** | true (default) <br/> false |
+| **Possible values** | none <br/> safe (default) <br/> all |
 
 ## Recommended configuration profile
 
@@ -266,7 +270,7 @@ The following configuration profile will:
   - **Potentially unwanted applications (PUA)** are blocked.
   - **Archive bombs** (file with a high compression rate) are audited to the product logs.
 - Enable cloud-delivered protection.
-- Enable automatic sample submission.
+- Enable automatic sample submission at `safe` level.
 
 ### Sample profile
 
@@ -286,7 +290,7 @@ The following configuration profile will:
       ]
    },
    "cloudService":{
-      "automaticSampleSubmission":true,
+      "automaticSampleSubmissionConsent":"safe",
       "enabled":true
    }
 }
@@ -346,7 +350,7 @@ The following configuration profile contains entries for all settings described
    "cloudService":{
       "enabled":true,
       "diagnosticLevel":"optional",
-      "automaticSampleSubmission":true
+      "automaticSampleSubmissionConsent":"safe"
    }
 }
 ```

windows/security/threat-protection/microsoft-defender-atp/linux-pua.md

@@ -53,7 +53,7 @@ You can configure how PUA files are handled from the command line or from the ma
 In Terminal, execute the following command to configure PUA protection:
 
 ```bash
-$ mdatp --threat --type-handling potentially_unwanted_application [off|audit|block]
+$ mdatp threat policy set --type potentially_unwanted_application --action [off|audit|block]
 ```
 
 ### Use the management console to configure PUA protection:

windows/security/threat-protection/microsoft-defender-atp/linux-resources.md

@@ -31,29 +31,24 @@ If you can reproduce a problem, please increase the logging level, run the syste
 1. Increase logging level:
 
    ```bash
-   $ mdatp --log-level verbose
+   $ mdatp log level set --level verbose
-   Creating connection to daemon
+   Log level configured successfully
-   Connection established
-   Operation succeeded
    ```
 
 2. Reproduce the problem.
 
-3. Run `sudo mdatp --diagnostic --create` to backup Microsoft Defender ATP's logs. The files will be stored inside of a .zip archive. This command will also print out the file path to the backup after the operation succeeds:
+3. Run `sudo mdatp diagnostic create` to back up Microsoft Defender ATP's logs. The files will be stored inside of a .zip archive. This command will also print out the file path to the backup after the operation succeeds:
 
    ```bash
-   $ sudo mdatp --diagnostic --create
+   $ sudo mdatp diagnostic create
-   Creating connection to daemon
+   Diagnostic file created: <path to file>
-   Connection established
    ```
 
 4. Restore logging level:
 
    ```bash
-   $ mdatp --log-level info
+   $ mdatp log level set --level info
-   Creating connection to daemon
+   Log level configured successfully
-   Connection established
-   Operation succeeded
    ```
 
 ## Log installation issues
@@ -78,21 +73,22 @@ Important tasks, such as controlling product settings and triggering on-demand s
 
 |Group        |Scenario                                   |Command                                                                |
 |-------------|-------------------------------------------|-----------------------------------------------------------------------|
-|Configuration|Turn on/off real-time protection           |`mdatp --config realTimeProtectionEnabled [true/false]`                |
+|Configuration|Turn on/off real-time protection           |`mdatp config real_time_protection --value [enabled|disabled]`         |
-|Configuration|Turn on/off cloud protection               |`mdatp --config cloudEnabled [true/false]`                             |
+|Configuration|Turn on/off cloud protection               |`mdatp config cloud --value [enabled|disabled]`                        |
-|Configuration|Turn on/off product diagnostics            |`mdatp --config cloudDiagnosticEnabled [true/false]`                               |
+|Configuration|Turn on/off product diagnostics            |`mdatp config cloud-diagnostic --value [enabled|disabled]`             |
-|Configuration|Turn on/off automatic sample submission    |`mdatp --config cloudAutomaticSampleSubmission [true/false]`           |
+|Configuration|Turn on/off automatic sample submission    |`mdatp config cloud-automatic-sample-submission [enabled|disabled]`    |
-|Configuration|Turn on PUA protection                     |`mdatp --threat --type-handling potentially_unwanted_application block`|
+|Configuration|Turn on/off AV passive mode                |`mdatp config passive-mode [enabled|disabled]`                         |
-|Configuration|Turn off PUA protection                    |`mdatp --threat --type-handling potentially_unwanted_application off`  |
+|Configuration|Turn on PUA protection                     |`mdatp threat policy set --type potentially_unwanted_application --action block` |
-|Configuration|Turn on audit mode for PUA protection      |`mdatp --threat --type-handling potentially_unwanted_application audit`|
+|Configuration|Turn off PUA protection                    |`mdatp threat policy set --type potentially_unwanted_application --action off` |
-|Diagnostics  |Change the log level                       |`mdatp --log-level [error/warning/info/verbose]`                       |
+|Configuration|Turn on audit mode for PUA protection      |`mdatp threat policy set --type potentially_unwanted_application --action audit` |
-|Diagnostics  |Generate diagnostic logs                   |`mdatp --diagnostic --create`                                                   |
+|Diagnostics  |Change the log level                       |`mdatp log level set --level verbose [error|warning|info|verbose]`     |
-|Health       |Check the product's health                 |`mdatp --health`                                                       |
+|Diagnostics  |Generate diagnostic logs                   |`mdatp diagnostic create`                                              |
-|Protection   |Scan a path                                |`mdatp --scan --path [path]`                                           |
+|Health       |Check the product's health                 |`mdatp health`                                                         |
-|Protection   |Do a quick scan                            |`mdatp --scan --quick`                                                 |
+|Protection   |Scan a path                                |`mdatp scan custom --path [path]`                                      |
-|Protection   |Do a full scan                             |`mdatp --scan --full`                                                  |
+|Protection   |Do a quick scan                            |`mdatp scan quick`                                                     |
-|Protection   |Cancel an ongoing on-demand scan           |`mdatp --scan --cancel`                                                |
+|Protection   |Do a full scan                             |`mdatp scan full`                                                      |
-|Protection   |Request a security intelligence update     |`mdatp --definition-update`                                            |
+|Protection   |Cancel an ongoing on-demand scan           |`mdatp scan cancel`                                                    |
+|Protection   |Request a security intelligence update     |`mdatp definitions update`                                             |
 
 ## Microsoft Defender ATP portal information
 

windows/security/threat-protection/microsoft-defender-atp/linux-support-connectivity.md

@@ -29,7 +29,7 @@ ms.topic: conceptual
 To test if Microsoft Defender ATP for Linux can communicate to the cloud with the current network settings, run a connectivity test from the command line:
 
 ```bash
-$ mdatp --connectivity-test
+$ mdatp connectivity test
 ```
 
 If the connectivity test fails, check if the machine has Internet access and if [any of the endpoints required by the product](microsoft-defender-atp-linux.md#network-connections) are blocked by a proxy or firewall.
@@ -84,7 +84,7 @@ $ sudo systemctl daemon-reload; sudo systemctl restart mdatp
 Upon success, attempt another connectivity test from the command line:
 
 ```bash
-$ mdatp --connectivity-test
+$ mdatp connectivity test
 ```
 
 If the problem persists, contact customer support.

windows/security/threat-protection/microsoft-defender-atp/linux-support-install.md

@@ -116,6 +116,7 @@ and try again.
 
 If none of the above steps help, collect the diagnostic logs:
 ```bash
-$ sudo mdatp --diagnostic --create
+$ sudo mdatp diagnostic create
+Diagnostic file created: <path to file>
 ```
 Path to a zip file that contains the logs will be displayed as an output. Reach out to our customer support with these logs.

windows/security/threat-protection/microsoft-defender-atp/linux-support-perf.md

@@ -36,7 +36,8 @@ The following steps can be used to troubleshoot and mitigate these issues:
     If your device is not managed by your organization, real-time protection can be disabled from the command line:
 
     ```bash
-    $ mdatp --config realTimeProtectionEnabled false
+    $ mdatp config real-time-protection --value disabled
+    Configuration property updated
     ```
 
     If your device is managed by your organization, real-time protection can be disabled by your administrator using the instructions in [Set preferences for Microsoft Defender ATP for Linux](linux-preferences.md).
@@ -49,19 +50,20 @@ The following steps can be used to troubleshoot and mitigate these issues:
     This feature is enabled by default on the `Dogfood` and `InsisderFast` channels. If you're using a different update channel, this feature can be enabled from the command line:
  
     ```bash
-    $ mdatp config real_time_protection_statistics_enabled on
+    $ mdatp config real-time-protection-statistics --value enabled
     ```
 
     This feature requires real-time protection to be enabled. To check the status of real-time protection, run the following command:
 
     ```bash
-    $ mdatp health
+    $ mdatp health --field real_time_protection_enabled
     ```
 
     Verify that the `real_time_protection_enabled` entry is `true`. Otherwise, run the following command to enable it:
 
     ```bash
-    $ mdatp --config realTimeProtectionEnabled true
+    $ mdatp config real-time-protection --value enabled
+    Configuration property updated
     ```
 
     To collect current statistics, run:

windows/security/threat-protection/microsoft-defender-atp/linux-updates.md

@@ -26,6 +26,12 @@ ms.topic: conceptual
 
 Microsoft regularly publishes software updates to improve performance, security, and to deliver new features.
 
+> [!WARNING]
+> Each version of Microsoft Defender ATP for Linux has an expiration date, after which it will no longer continue to protect your device. You must update the product prior to this date. To check the expiration date, run the following command:
+> ```bash
+> mdatp health --field product_expiration
+> ```
+
 To update Microsoft Defender ATP for Linux manually, execute one of the following commands:
 
 ## RHEL and variants (CentOS and Oracle Linux)

windows/security/threat-protection/microsoft-defender-atp/linux-whatsnew.md

@@ -19,6 +19,12 @@ ms.topic: conceptual
 
 # What's new in Microsoft Defender Advanced Threat Protection for Linux
 
+## 101.00.75
+
+- Added support for the following file system types: `ecryptfs`, `fuse`, `fuseblk`, `jfs`, `nfs`, `overlay`, `ramfs`, `reiserfs`, `udf`, and `vfat`
+- New syntax for the command-line tool. For more information, see [this page](linux-resources.md#configure-from-the-command-line).
+- Performance improvements & bug fixes
+
 ## 100.90.70
 
 > [!WARNING]

windows/security/threat-protection/microsoft-defender-atp/mac-install-manually.md

@@ -66,10 +66,10 @@ To complete this process, you must have admin privileges on the machine.
 
     ![Security and privacy window screenshot](../microsoft-defender-antivirus/images/MDATP-31-SecurityPrivacySettings.png)
 
-The installation proceeds.
+   The installation proceeds.
 
-> [!CAUTION]
+   > [!CAUTION]
-> If you don't select **Allow**, the installation will proceed after 5 minutes. Defender ATP will be loaded, but some features, such as real-time protection, will be disabled. See [Troubleshoot kernel extension issues](mac-support-kext.md) for information on how to resolve this.
+   > If you don't select **Allow**, the installation will proceed after 5 minutes. Defender ATP will be loaded, but some features, such as real-time protection, will be disabled. See [Troubleshoot kernel extension issues](mac-support-kext.md) for information on how to resolve this.
 
 > [!NOTE]
 > macOS may request to reboot the machine upon the first installation of Microsoft Defender. Real-time protection will not be available until the machine is rebooted.
@@ -81,21 +81,19 @@ The installation proceeds.
     The client machine is not associated with orgId. Note that the *orgId* attribute is blank.
 
     ```bash
-    $ mdatp --health orgId
+    mdatp --health orgId
     ```
 
 2. Run the Python script to install the configuration file:
 
     ```bash
-    $ /usr/bin/python MicrosoftDefenderATPOnboardingMacOs.py
+    /usr/bin/python MicrosoftDefenderATPOnboardingMacOs.py
-    Generating /Library/Application Support/Microsoft/Defender/com.microsoft.wdav.atp.plist ... (You may be required to enter sudos password)
     ```
 
 3. Verify that the machine is now associated with your organization and reports a valid *orgId*:
 
     ```bash
-    $ mdatp --health orgId
+    mdatp --health orgId
-    E6875323-A6C0-4C60-87AD-114BBE7439B8
     ```
 
 After installation, you'll see the Microsoft Defender icon in the macOS status bar in the top-right corner.

windows/security/threat-protection/microsoft-defender-atp/mac-install-with-intune.md

@@ -207,7 +207,7 @@ You may now enroll more devices. You can also enroll them later, after you have
    </plist>
    ```
 
-9. To allow Defender and Auto Update for displaying notifications in UI on macOS 10.15 (Catalina), import the following .mobileconfig as a custom payload: <a name = "create-system-configuration-profiles-step-9" id = "create-system-configuration-profiles-step-9"></a>
+9. To allow Defender and Auto Update to display notifications in UI on macOS 10.15 (Catalina), import the following .mobileconfig as a custom payload: <a name = "create-system-configuration-profiles-step-9" id = "create-system-configuration-profiles-step-9"></a>
 
    ```xml
    <?xml version="1.0" encoding="UTF-8"?>

windows/security/threat-protection/microsoft-defender-atp/manage-indicators.md

@@ -148,7 +148,7 @@ It's important to understand the following prerequisites prior to creating indic
 
 5. Review the details in the Summary tab, then click **Save**.
 
-## Create indicators for certificates (preview)
+## Create indicators for certificates
 
 You can create indicators for certificates. Some common use cases include:
 

windows/security/threat-protection/microsoft-defender-atp/microsoft-defender-atp-linux.md

@@ -91,12 +91,22 @@ If you experience any installation failures, refer to [Troubleshooting installat
 - Disk space: 650 MB
 - The solution currently provides real-time protection for the following file system types:
 
-  - btrfs
+  - `btrfs`
-  - ext2
+  - `ecryptfs`
-  - ext3
+  - `ext2`
-  - ext4
+  - `ext3`
-  - tmpfs
+  - `ext4`
-  - xfs
+  - `fuse`
+  - `fuseblk`
+  - `jfs`
+  - `nfs`
+  - `overlay`
+  - `ramfs`
+  - `reiserfs`
+  - `tmpfs`
+  - `udf`
+  - `vfat`
+  - `xfs`
 
   More file system types will be added in the future.