diff --git a/devices/surface-hub/hub-teams-app.md b/devices/surface-hub/hub-teams-app.md
index 90d82560d8..358d5f8d3c 100644
--- a/devices/surface-hub/hub-teams-app.md
+++ b/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
- Ability to search for External users | June 10, 2020
|
| 0.2020.13201 | - Quality improvements and Bug fixes | June 1, 2020
|
-| 0.2020.4301.0 | - Accept incoming PSTN calls on Surface Hub
- Added controls for Attendee/Presenter role changes | May 21, 2020 |
+| 0.2020.4301.0 | - Accept incoming PSTN calls on Surface Hub
- Consume Attendee/Presenter role changes | May 21, 2020 |
diff --git a/devices/surface-hub/index.yml b/devices/surface-hub/index.yml
index 249deba5a0..a4a4b05f20 100644
--- a/devices/surface-hub/index.yml
+++ b/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.
- services: product-insights
+ description: Get started with Microsoft Surface Hub # Required; article description that is displayed in search results. < 160 chars.
ms.service: product-insights #Required; service per approved list. service slug assigned to your service by ACOM.
- ms.topic: hub-page # Required
- ms.prod: surface-hub
- ms.technology: windows
- audience: ITPro
- ms.localizationpriority: medium
+ ms.topic: landing-page # Required
+ manager: laurawi
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)
-# 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
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
-# productDirectory section (optional)
-productDirectory:
- title: Deploy, manage, and support your Surface Hub devices # < 60 chars (optional)
- summary: Find related links to deploy, manage and support your Surface Hub devices. # < 160 chars (optional)
- items:
+landingContent:
+# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - 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
- # imageSrc should be square in ratio with no whitespace
- imageSrc: https://docs.microsoft.com/office/media/icons/deploy-blue.svg
- links:
- - url: surface-hub-2s-adoption-kit.md
- text: Surface Hub 2S adoption and training
- - url: surface-hub-2s-deploy-checklist.md
- text: Surface Hub 2S deployment checklist
- - url: surface-hub-2s-account.md
- text: Create device account
- # 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
+ - title: Manage Surface devices
+ linkLists:
+ - linkListType: how-to-guide
+ links:
+ - text: Manage Surface Hub 2S with Intune
+ url: surface-hub-2s-manage-intune.md
+ - text: Manage local settings
+ url: local-management-surface-hub-settings.md
+ - text: Manage Windows updates on Surface Hub
+ url: manage-windows-updates-for-surface-hub.md
-# additionalContent section (optional)
-# Card with links style
-additionalContent:
- # Supports up to 3 sections
- sections:
- - title: Other content # < 60 chars (optional)
- summary: Find related links for videos, community and support. # < 160 chars (optional)
- items:
- # Card
- - title: Get ready for Surface Hub 2S
- links:
- - text: Ordering Surface Hub 2S
- url: https://www.microsoft.com/p/surface-hub-2S/8P62MW6BN9G4?activetab=pivot:overviewtab
- - text: Prepare your environment for Surface Hub 2S
- url: surface-hub-2s-prepare-environment.md
- # Card
- - title: Surface Hub 2S Videos
- links:
- - 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
- # Card
- - title: Community
- links:
- - text: Join the Surface Hub Technical Community
- url: https://techcommunity.microsoft.com/t5/Surface-Hub/bd-p/SurfaceHub
- - text: Join the Surface Devices Technical Community
- url: https://techcommunity.microsoft.com/t5/Surface-Devices/ct-p/SurfaceDevices
+ # Card
+ - title: Explore security guidance
+ linkLists:
+ - linkListType: learn
+ links:
+ - text: Secure and manage Surface Hub 2S with SEMM and UEFI
+ url: surface-hub-2s-secure-with-uefi-semm.md
+ - text: Wi-Fi security considerations
+ url: surface-hub-wifi-direct.md
+ - text: Surface Hub security overview
+ url: surface-hub-security.md
+
+ # Card
+ - title: Troubleshoot Surface Hub
+ linkLists:
+ - linkListType: learn
+ links:
+ - text: Service and warranty
+ url: https://support.microsoft.com/help/4493926
+ - text: Recover & reset Surface Hub 2S
+ url: surface-hub-2s-recover-reset.md
+ - text: Surface Hub support solutions
+ url: support-solutions-surface-hub.md
+
+
+# Card
+ - title: Surface Hub 2S Videos
+ linkLists:
+ - linkListType: video
+ links:
+ - 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
diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-install-manually.md b/windows/security/threat-protection/microsoft-defender-atp/mac-install-manually.md
index ebaa93dac7..c2941c40da 100644
--- a/windows/security/threat-protection/microsoft-defender-atp/mac-install-manually.md
+++ b/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.

-The installation proceeds.
+ The installation proceeds.
-> [!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.
+ > [!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.
> [!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
- Generating /Library/Application Support/Microsoft/Defender/com.microsoft.wdav.atp.plist ... (You may be required to enter sudos password)
+ /usr/bin/python MicrosoftDefenderATPOnboardingMacOs.py
```
3. Verify that the machine is now associated with your organization and reports a valid *orgId*:
```bash
- $ mdatp --health orgId
- E6875323-A6C0-4C60-87AD-114BBE7439B8
+ mdatp --health orgId
```
After installation, you'll see the Microsoft Defender icon in the macOS status bar in the top-right corner.