removed 2 pages to resolve merge conflict

2025-06-16 02:43:43 +00:00 · 2019-11-14 15:31:29 -05:00
parent 7609c20d6d 4f7fd1e1a6
commit b7722c690d
211 changed files with 9682 additions and 10038 deletions
--- a/education/developers.yml
+++ b/education/developers.yml
@ -1,14 +1,14 @@
 ### YamlMime:Hub

-title: M365 Education Documentation for developers
+title: Microsoft 365 Education Documentation for developers
 summary: Are you an app developer looking for information about developing solutions on Microsoft Education products? Start here.

 metadata:
-  title: M365 Education Documentation for developers
+  title: Microsoft 365 Education Documentation for developers
  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

--- a/education/index.yml
+++ b/education/index.yml
@ -1,14 +1,14 @@
 ### YamlMime:Hub

-title: M365 Education Documentation
+title: Microsoft 365 Education Documentation
 summary: Microsoft 365 Education empowers educators to unlock creativity, promote teamwork, and provide a simple and safe experience in a single, affordable solution built for education.

 metadata:
-  title: M365 Education Documentation
+  title: Microsoft 365 Education Documentation
  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

--- a/education/itadmins.yml
+++ b/education/itadmins.yml
@ -1,33 +1,33 @@
 ### YamlMime:Hub

-title: M365 Education Documentation for IT admins
-summary: M365 Education consists of Office 365 Education, Windows 10 Education, and security and management tools such as Intune for Education and School Data Sync.
+title: Microsoft 365 Education Documentation for IT admins
+summary: Microsoft 365 Education consists of Office 365 Education, Windows 10 Education, and security and management tools such as Intune for Education and School Data Sync.

 metadata:
-  title: M365 Education Documentation for IT admins
+  title: Microsoft 365 Education Documentation for IT admins
  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
--- a/education/partners.yml
+++ b/education/partners.yml
@ -1,14 +1,14 @@
 ### YamlMime:Hub

-title: M365 Education Documentation for partners
+title: Microsoft 365 Education Documentation for partners
 summary: Looking for resources available to Microsoft Education partners? Start here.

 metadata:
-  title: M365 Education Documentation for partners
+  title: Microsoft 365 Education Documentation for partners
  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