From 9c2b687b280005c7cb63aa9a90f489dae387ad0c Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:08:11 -0800 Subject: [PATCH 01/12] Update developers.yml --- education/developers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3f6da4b114d6c969abf597394695a142a8621de8 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:08:37 -0800 Subject: [PATCH 02/12] Update index.yml --- education/index.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f76a2543acfcedacc28f56fb7add673b4824f002 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:09:58 -0800 Subject: [PATCH 03/12] Update itadmins.yml --- education/itadmins.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) 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 From 1a825e0a8df56c75eb8c51d437c77e6fcf876876 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:10:29 -0800 Subject: [PATCH 04/12] Update partners.yml --- education/partners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f7a55cd85e97879f08d238d7a9e631df90f047c8 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:12:43 -0800 Subject: [PATCH 05/12] Update endpoint-detection-response-mac-preview.md --- .../endpoint-detection-response-mac-preview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 96fcf0ed17..2e863ccd52 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 @@ -54,7 +54,7 @@ c. Create an entry with com.microsoft.wdav as the preference domain and uplo ### Step 2: Jamf deployment and onboarding -Follow the instruction in docs about [JAMF-based deployment](microsoft-defender-atp-mac-install-with-jamf.md). +Follow the instruction in docs about [JAMF-based deployment](mac-install-with-jamf.md). ## Deploy centrally with Intune From f7a09e499883d6fb3700cb013e141f8aa5ae9b6d Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:13:36 -0800 Subject: [PATCH 06/12] Update endpoint-detection-response-mac-preview.md --- .../endpoint-detection-response-mac-preview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e863ccd52..accb5e84c1 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 @@ -136,7 +136,7 @@ h. Select Manage > Assignments. In the Include tab, select Assign to All ### Step 2: Intune deployment and onboarding -Follow the instruction in docs about [Microsoft Intune-based deployment](microsoft-defender-atp-mac-install-with-intune.md). +Follow the instruction in docs about [Microsoft Intune-based deployment](mac-install-with-intune.md). ## Deploy manually on a single machine From 064c3269a15c237f04f55e46e5f205ec639ae504 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:14:22 -0800 Subject: [PATCH 07/12] Update endpoint-detection-response-mac-preview.md --- .../endpoint-detection-response-mac-preview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 accb5e84c1..9d8f0c3a5f 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 @@ -162,7 +162,7 @@ b. Copy plist file to /Library/Managed Preferences/ ### Step 2: Deployment and onboarding -Follow the instruction in docs about [Set preferences for Microsoft Defender ATP for Mac](microsoft-defender-atp-mac-preferences.md) +Follow the instruction in docs about [Set preferences for Microsoft Defender ATP for Mac](mac-preferences.md) ## Troubleshooting From a99460c2f6aacdcd4ed0f6c966833094be5aa3fa Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:17:53 -0800 Subject: [PATCH 08/12] Update mac-exclusions.md --- .../threat-protection/microsoft-defender-atp/mac-exclusions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 06be0af3ffbf3bf0f59d721d323208b627a35ae8 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:24:14 -0800 Subject: [PATCH 09/12] Update mac-install-manually.md --- .../microsoft-defender-atp/mac-install-manually.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..ddbe11dfe2 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. From 4b9e778d8f65fd97c6411c380e6e2b64b0a37f2c Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:25:22 -0800 Subject: [PATCH 10/12] Update mac-install-manually.md --- .../microsoft-defender-atp/mac-install-manually.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ddbe11dfe2..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 @@ -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. From 9d602cbe63a1c137cd162c217e4d159dbe764fd9 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:27:47 -0800 Subject: [PATCH 11/12] Update mac-install-with-intune.md --- .../microsoft-defender-atp/mac-install-with-intune.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. From e41f9a95abfdff37922f77f36046dffb112f0837 Mon Sep 17 00:00:00 2001 From: denisebmsft Date: Tue, 5 Nov 2019 14:36:58 -0800 Subject: [PATCH 12/12] Update TOC.md Mac links --- windows/security/threat-protection/TOC.md | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) 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)