diff --git a/education/developers.yml b/education/developers.yml index 23f2c74297..5c73169853 100644 --- a/education/developers.yml +++ b/education/developers.yml @@ -8,7 +8,7 @@ metadata: description: Are you an app developer looking for information about developing solutions on Microsoft Education products? Start here. ms.service: help ms.topic: hub-page - author: v-lamoyn + author: LaurenMoynihan ms.author: v-lamoyn ms.date: 10/24/2019 diff --git a/education/index.yml b/education/index.yml index dc0e6fa938..9d3a74a32c 100644 --- a/education/index.yml +++ b/education/index.yml @@ -8,7 +8,7 @@ metadata: description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers. ms.service: help ms.topic: hub-page - author: v-lamoyn + author: LaurenMoynihan ms.author: v-lamoyn ms.date: 10/24/2019 diff --git a/education/itadmins.yml b/education/itadmins.yml index dc37e8803d..25eabd906a 100644 --- a/education/itadmins.yml +++ b/education/itadmins.yml @@ -8,26 +8,26 @@ metadata: description: M365 Education consists of Office 365 Education, Windows 10 Education, and security and management tools such as Intune for Education and School Data Sync. ms.service: help ms.topic: hub-page - author: v-lamoyn + author: LaurenMoynihan ms.author: v-lamoyn ms.date: 10/24/2019 productDirectory: - summary: This guide is designed for IT admins looking for the simplest way to move their platform to the cloud. It does not capture all the necessary steps for large scale or complex deployments. Check out at https://edujourney.microsoft.com/. Find help now at https://docs.microsoft.com/en-us/microsoft-365/education/deploy/find-deployment-help. + summary: This guide is designed for IT admins looking for the simplest way to move their platform to the cloud. It does not capture all the necessary steps for large scale or complex deployments. Check out at https://edujourney.microsoft.com/. Find help now at https://docs.microsoft.com/microsoft-365/education/deploy/find-deployment-help. items: # Card - title: Phase 1 - Cloud deployment imageSrc: ./images/EDU-Deploy.svg links: - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/create-your-office-365-tenant + - url: https://docs.microsoft.com/microsoft-365/education/deploy/create-your-office-365-tenant text: 1. Create your Office 365 tenant - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/secure-and-configure-your-network + - url: https://docs.microsoft.com/microsoft-365/education/deploy/secure-and-configure-your-network text: 2. Secure and configure your network - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/aad-connect-and-adfs + - url: https://docs.microsoft.com/microsoft-365/education/deploy/aad-connect-and-adfs text: 3. Sync your active directory - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/school-data-sync + - url: https://docs.microsoft.com/microsoft-365/education/deploy/school-data-sync text: 4. Sync you SIS using School Data Sync - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/license-users + - url: https://docs.microsoft.com/microsoft-365/education/deploy/license-users text: 5. License users # Card - title: Phase 2 - Device management @@ -35,11 +35,11 @@ productDirectory: links: - url: https://docs.microsoft.com/en-us/education/windows/ text: 1. Get started with Windows 10 for Education - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/set-up-windows-10-education-devices + - url: https://docs.microsoft.com/microsoft-365/education/deploy/set-up-windows-10-education-devices text: 2. Set up Windows 10 devices - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/intune-for-education + - url: https://docs.microsoft.com/microsoft-365/education/deploy/intune-for-education text: 3. Get started with Intune for Education - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/use-intune-for-education + - url: https://docs.microsoft.com/microsoft-365/education/deploy/use-intune-for-education text: 4. Use Intune to manage groups, apps, and settings - url: https://docs.microsoft.com/en-us/intune/enrollment/enrollment-autopilot text: 5. Enroll devices using Windows Autopilot @@ -47,28 +47,28 @@ productDirectory: - title: Phase 3 - Apps management imageSrc: ./images/EDU-Apps-Mgmt.svg links: - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/configure-admin-settings + - url: https://docs.microsoft.com/microsoft-365/education/deploy/configure-admin-settings text: 1. Configure admin settings - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/set-up-teams-for-education + - url: https://docs.microsoft.com/microsoft-365/education/deploy/set-up-teams-for-education text: 2. Set up Teams for Education - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/deploy-office-365 + - url: https://docs.microsoft.com/microsoft-365/education/deploy/deploy-office-365 text: 3. Set up Office 365 - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/microsoft-store-for-education + - url: https://docs.microsoft.com/microsoft-365/education/deploy/microsoft-store-for-education text: 4. Install apps from Microsoft Store for Education - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/minecraft-for-education + - url: https://docs.microsoft.com/microsoft-365/education/deploy/minecraft-for-education text: 5. Install Minecraft - Education Edition # Card - title: Complete your deployment # imageSrc should be square in ratio with no whitespace imageSrc: ./images/EDU-Tasks.svg links: - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/deploy-exchange-online + - url: https://docs.microsoft.com/microsoft-365/education/deploy/deploy-exchange-online text: Deploy Exchange Online - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/deploy-sharepoint-online-and-onedrive + - url: https://docs.microsoft.com/microsoft-365/education/deploy/deploy-sharepoint-online-and-onedrive text: Deploy SharePoint Online and OneDrive - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/deploy-exchange-server-hybrid + - url: https://docs.microsoft.com/microsoft-365/education/deploy/deploy-exchange-server-hybrid text: Deploy Exchange Server hybrid - - url: https://docs.microsoft.com/en-us/microsoft-365/education/deploy/deploy-sharepoint-server-hybrid + - url: https://docs.microsoft.com/microsoft-365/education/deploy/deploy-sharepoint-server-hybrid text: Deploy SharePoint Server Hybrid # Card - title: Security & Compliance @@ -80,9 +80,9 @@ productDirectory: text: Azure information protection deployment acceleration guide - url: https://docs.microsoft.com/en-us/cloud-app-security/getting-started-with-cloud-app-security text: Microsoft Cloud app security - - url: https://docs.microsoft.com/en-us/microsoft-365/compliance/create-test-tune-dlp-policy + - url: https://docs.microsoft.com/microsoft-365/compliance/create-test-tune-dlp-policy text: Office 365 data loss prevention - - url: https://docs.microsoft.com/en-us/microsoft-365/compliance/ + - url: https://docs.microsoft.com/microsoft-365/compliance/ text: Office 365 advanced compliance - url: https://social.technet.microsoft.com/wiki/contents/articles/35748.office-365-what-is-customer-lockbox-and-how-to-enable-it.aspx text: Deploying Lockbox diff --git a/education/partners.yml b/education/partners.yml index 6dd4d0038a..05d585f5f5 100644 --- a/education/partners.yml +++ b/education/partners.yml @@ -8,7 +8,7 @@ metadata: description: Looking for resources available to Microsoft Education partners? Start here. ms.service: help ms.topic: hub-page - author: v-lamoyn + author: LaurenMoynihan ms.author: v-lamoyn ms.date: 10/24/2019 diff --git a/windows/security/threat-protection/TOC.md b/windows/security/threat-protection/TOC.md index f2d6261849..d8b56f6209 100644 --- a/windows/security/threat-protection/TOC.md +++ b/windows/security/threat-protection/TOC.md @@ -312,22 +312,22 @@ ### [Microsoft Defender Advanced Threat Protection for Mac](microsoft-defender-atp/microsoft-defender-atp-mac.md) -#### [What's New in Microsoft Defender ATP for Mac](microsoft-defender-atp/microsoft-defender-atp-mac-whatsnew.md) +#### [What's New in Microsoft Defender ATP for Mac](microsoft-defender-atp/mac-whatsnew.md) #### [Deploy Microsoft Defender Advanced Threat Protection for Mac]() -##### [Microsoft Intune-based deployment](microsoft-defender-atp/microsoft-defender-atp-mac-install-with-intune.md) -##### [JAMF-based deployment](microsoft-defender-atp/microsoft-defender-atp-mac-install-with-jamf.md) -##### [Deployment with a different Mobile Device Management (MDM) system](windows-defender-atp/microsoft-defender-atp-mac-install-with-other-mdm.md) -##### [Manual deployment](microsoft-defender-atp/microsoft-defender-atp-mac-install-manually.md) -#### [Update Microsoft Defender ATP for Mac](microsoft-defender-atp/microsoft-defender-atp-mac-updates.md) +##### [Microsoft Intune-based deployment](microsoft-defender-atp/mac-install-with-intune.md) +##### [JAMF-based deployment](microsoft-defender-atp/mac-install-with-jamf.md) +##### [Deployment with a different Mobile Device Management (MDM) system](windows-defender-atp/mac-install-with-other-mdm.md) +##### [Manual deployment](microsoft-defender-atp/mac-install-manually.md) +#### [Update Microsoft Defender ATP for Mac](microsoft-defender-atp/mac-updates.md) #### [Configure Microsoft Defender ATP for Mac]() -##### [Configure and validate exclusions](microsoft-defender-atp/microsoft-defender-atp-mac-exclusions.md) -##### [Set preferences for Microsoft Defender ATP for Mac](microsoft-defender-atp/microsoft-defender-atp-mac-preferences.md) -##### [Detect and block Potentially Unwanted Applications](microsoft-defender-atp/microsoft-defender-atp-mac-pua.md) +##### [Configure and validate exclusions](microsoft-defender-atp/mac-exclusions.md) +##### [Set preferences for Microsoft Defender ATP for Mac](microsoft-defender-atp/mac-preferences.md) +##### [Detect and block Potentially Unwanted Applications](microsoft-defender-atp/mac-pua.md) #### [Troubleshoot Microsoft Defender ATP for Mac]() -##### [Troubleshoot performance issues](microsoft-defender-atp/microsoft-defender-atp-mac-support-perf.md) -##### [Troubleshoot kernel extension issues](microsoft-defender-atp/microsoft-defender-atp-mac-support-kext.md) -#### [Privacy for Microsoft Defender ATP for Mac](microsoft-defender-atp/microsoft-defender-atp-mac-privacy.md) -#### [Resources for Microsoft Defender ATP for Mac](microsoft-defender-atp/microsoft-defender-atp-mac-resources.md) +##### [Troubleshoot performance issues](microsoft-defender-atp/mac-support-perf.md) +##### [Troubleshoot kernel extension issues](microsoft-defender-atp/mac-support-kext.md) +#### [Privacy for Microsoft Defender ATP for Mac](microsoft-defender-atp/mac-privacy.md) +#### [Resources for Microsoft Defender ATP for Mac](microsoft-defender-atp/mac-resources.md) diff --git a/windows/security/threat-protection/microsoft-defender-atp/endpoint-detection-response-mac-preview.md b/windows/security/threat-protection/microsoft-defender-atp/endpoint-detection-response-mac-preview.md index 0ffb63b1f2..8dd084a21f 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/endpoint-detection-response-mac-preview.md +++ b/windows/security/threat-protection/microsoft-defender-atp/endpoint-detection-response-mac-preview.md @@ -129,7 +129,7 @@ h. Select Manage > Assignments. In the Include tab, select Assign to All ## Enable the "Insider" program manually on a single machine -In the command prompt, run +In the command prompt, run: ```bash mdatp --edr --early-preview true diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md index 354ffebb0c..b1c74f0264 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-exclusions.md @@ -51,7 +51,7 @@ Process | A specific process (specified either by the full path or file name) an ### From the management console -For more information on how to configure exclusions from JAMF, Intune, or another management console, see [Set preferences for Microsoft Defender ATP for Mac](microsoft-defender-atp-mac-preferences.md). +For more information on how to configure exclusions from JAMF, Intune, or another management console, see [Set preferences for Microsoft Defender ATP for Mac](mac-preferences.md). ### From the user interface 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 62724b7cfa..a8e7ca85f9 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 @@ -81,7 +81,7 @@ To complete this process, you must have admin privileges on the machine. 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](microsoft-defender-atp-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. @@ -123,8 +123,8 @@ To grant consent, open System Preferences -> Security & Privacy -> Privacy -> Fu ## Logging installation issues -See [Logging installation issues](microsoft-defender-atp-mac-resources.md#logging-installation-issues) for more information on how to find the automatically generated log that is created by the installer when an error occurs. +See [Logging installation issues](mac-resources.md#logging-installation-issues) for more information on how to find the automatically generated log that is created by the installer when an error occurs. ## Uninstallation -See [Uninstalling](microsoft-defender-atp-mac-resources.md#uninstalling) for details on how to remove Microsoft Defender ATP for Mac from client devices. +See [Uninstalling](mac-resources.md#uninstalling) for details on how to remove Microsoft Defender ATP for Mac from client devices. diff --git a/windows/security/threat-protection/microsoft-defender-atp/mac-install-with-intune.md b/windows/security/threat-protection/microsoft-defender-atp/mac-install-with-intune.md index 53eb663d4d..676e92c7ac 100644 --- a/windows/security/threat-protection/microsoft-defender-atp/mac-install-with-intune.md +++ b/windows/security/threat-protection/microsoft-defender-atp/mac-install-with-intune.md @@ -298,7 +298,7 @@ Once the Intune changes are propagated to the enrolled devices, you can see them 5. Use **macOS High Sierra 10.13** as the minimum OS and set *Ignore app version* to **Yes**. Other settings can be any arbitrary value. > [!CAUTION] - > Failure to set *Ignore app version* to **Yes** impacts the ability of the application to receive updates through Microsoft AutoUpdate. See [Deploy updates for Microsoft Defender ATP for Mac](microsoft-defender-atp-mac-updates.md) for additional information about how the product is updated. + > Failure to set *Ignore app version* to **Yes** impacts the ability of the application to receive updates through Microsoft AutoUpdate. See [Deploy updates for Microsoft Defender ATP for Mac](mac-updates.md) for additional information about how the product is updated. ![Device status blade screenshot](../windows-defender-antivirus/images/MDATP-8-IntuneAppInfo.png) @@ -341,8 +341,8 @@ Solution: Follow the steps above to create a device profile using WindowsDefende ## Logging installation issues -For more information on how to find the automatically generated log that is created by the installer when an error occurs, see [Logging installation issues](microsoft-defender-atp-mac-resources.md#logging-installation-issues) . +For more information on how to find the automatically generated log that is created by the installer when an error occurs, see [Logging installation issues](mac-resources.md#logging-installation-issues) . ## Uninstallation -See [Uninstalling](microsoft-defender-atp-mac-resources.md#uninstalling) for details on how to remove Microsoft Defender ATP for Mac from client devices. +See [Uninstalling](mac-resources.md#uninstalling) for details on how to remove Microsoft Defender ATP for Mac from client devices.