diff --git a/windows/deployment/index.yml b/windows/deployment/index.yml index bf40abe0b9..6e694f4e3b 100644 --- a/windows/deployment/index.yml +++ b/windows/deployment/index.yml @@ -13,7 +13,7 @@ metadata: ms.collection: windows-10 author: greg-lindsay #Required; your GitHub user alias, with correct capitalization. ms.author: greglin #Required; microsoft alias of author; optional team alias. - ms.date: 06/08/2020 #Required; mm/dd/yyyy format. + ms.date: 06/09/2020 #Required; mm/dd/yyyy format. localization_priority: medium # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new @@ -29,38 +29,12 @@ landingContent: - text: Windows 10 deployment scenarios url: windows-10-deployment-scenarios.md - - linkListType: quickstart + - linkListType: get-started links: - text: Demonstrate Autopilot deployment url: windows-autopilot/demonstrate-deployment-on-vm.md - text: Deploy Windows 10 in a test lab url: windows-10-poc.md - - linkListType: architecture - links: - - text: Windows 10 deployment considerations - url: planning/windows-10-deployment-considerations.md - - text: Windows 10 infrastructure requirements - url: planning/windows-10-infrastructure-requirements.md - - text: Windows 10 features lifecycle - url: planning/features-lifecycle.md - - text: Plan for volume activation - url: volume-activation/plan-for-volume-activation-client.md - - linkListType: how-to-guide - links: - - text: Prepare for Zero Touch Installation with Configuration Manager - url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md - - text: Prepare to deploy Windows 10 with MDT - url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md - - linkListType: deploy - links: - - text: Windows Autopilot scenarios and capabilities - url: windows-autopilot/windows-autopilot-scenarios.md - - text: Deploy Windows 10 to a new device with Configuration Manager - url: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md - - text: Deploy a Windows 10 image using MDT - url: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md - - text: Resolve Windows 10 upgrade errors - url: upgrade/resolve-windows-10-upgrade-errors.md # Card (optional) - title: Update Windows 10 @@ -75,6 +49,11 @@ landingContent: links: - text: Servicing the Windows 10 operating system url: update/waas-servicing-strategy-windows-10-updates.md + + + # Card (optional) + - title: Deployment planning + linkLists: - linkListType: architecture links: - text: Create a deployment plan @@ -87,61 +66,52 @@ landingContent: url: update/plan-determine-app-readiness.md - text: Define your servicing strategy url: update/waas-servicing-strategy-windows-10-updates.md + + # Card + - title: Prepare to deploy Windows 10 + linkLists: - linkListType: how-to-guide links: + - text: Prepare for Zero Touch Installation with Configuration Manager + url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md + - text: Prepare to deploy Windows 10 with MDT + url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md - text: Evaluate and update infrastructure url: update/update-policies.md - text: Build a successful servicing strategy url: update/waas-deployment-rings-windows-10-updates.md + + # Card + - title: Deploy and update Windows 10 + linkLists: - linkListType: deploy links: + - text: Windows Autopilot scenarios and capabilities + url: windows-autopilot/windows-autopilot-scenarios.md + - text: Deploy Windows 10 to a new device with Configuration Manager + url: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md + - text: Deploy a Windows 10 image using MDT + url: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md - text: Assign devices to servicing channels url: update/waas-servicing-channels-windows-10-updates.md - text: Deploy Windows 10 updates url: update/waas-servicing-channels-windows-10-updates.md - - text: Troubleshoot Windows Update - url: update/windows-update-troubleshooting.md + - text: Resolve Windows 10 upgrade errors + url: upgrade/resolve-windows-10-upgrade-errors.md # Card (optional) - - title: Resources + - title: Windows 10 resources linkLists: - - linkListType: reference - links: - - text: How does Windows Update work? - url: update/how-windows-update-works.md - - text: Unified Update Platform (UUP) architecture - url: update/windows-update-overview.md#unified-update-platform-uup-architecture - - text: Servicing stack updates - url: update/servicing-stack-updates.md - - text: Manage additional Windows Update setings - url: update/waas-wu-settings.md - - text: Delivery Optimization reference - url: update/waas-delivery-optimization-reference.md - - text: Convert an MBR partition to GPT - url: mbr-to-gpt.md - - text: VAMT technical reference - url: volume-activation/volume-activation-management-tool.md - - text: User State Migration Tool (USMT) overview - url: usmt/usmt-overview.md - - linkListType: reference + - linkListType: learn links: - text: Windows 10 release information url: https://docs.microsoft.com/windows/release-information/ - text: What's new in Windows 10 url: https://docs.microsoft.com/windows/whats-new/ - - text: Microsoft 365 for enterprise documention - url: https://docs.microsoft.com/microsoft-365/enterprise/ - - text: Microsoft Surface documentation - url: https://docs.microsoft.com/surface/ - - text: Evaluate Windows 10 Enterprise - url: https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise - - text: Microsoft FastTrack cloud solutions - url: https://www.microsoft.com/fasttrack/ - - text: Microsoft Intune documentation - url: https://docs.microsoft.com/mem/intune/ - - text: Microsoft Endpoint Configuration Manager documentation - url: https://docs.microsoft.com/mem/configmgr/ - text: Windows 10 Enterprise Security url: https://docs.microsoft.com/windows/security/ - text: Desktop Deployment Center url: https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home + - text: Microsoft 365 solution and architecture center + url: https://docs.microsoft.com/microsoft-365/solutions/?view=o365-worldwide + diff --git a/windows/deployment/index2.yml b/windows/deployment/index2.yml deleted file mode 100644 index 3827964e67..0000000000 --- a/windows/deployment/index2.yml +++ /dev/null @@ -1,115 +0,0 @@ -### YamlMime:Landing - -title: Windows 10 deployment resources and documentation # < 60 chars -summary: Learn about deploying and and keeping Windows 10 up to date. # < 160 chars - -metadata: - title: Windows 10 deployment resources and documentation # Required; page title displayed in search results. Include the brand. < 60 chars. - description: Learn about deploying Windows 10 and keeping it up to date in your organization. # Required; article description that is displayed in search results. < 160 chars. - services: windows-10 - ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM. - ms.subservice: subservice - ms.topic: landing-page # Required - ms.collection: windows-10 - author: greg-lindsay #Required; your GitHub user alias, with correct capitalization. - ms.author: greglin #Required; microsoft alias of author; optional team alias. - ms.date: 05/27/2020 #Required; mm/dd/yyyy format. - localization_priority: medium - -# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new - -landingContent: -# Cards and links should be based on top customer tasks or top subjects -# Start card title with a verb - # Card (optional) - - title: Deploy Windows 10 - linkLists: - - linkListType: overview - links: - - text: Windows 10 deployment scenarios - url: windows-10-deployment-scenarios.md - - - linkListType: get-started - links: - - text: Demonstrate Autopilot deployment - url: windows-autopilot/demonstrate-deployment-on-vm.md - - text: Deploy Windows 10 in a test lab - url: windows-10-poc.md - - # Card (optional) - - title: Update Windows 10 - linkLists: - - linkListType: overview - links: - - text: What is Windows as a service? - url: update/waas-overview.md - - text: Types of Windows updates - url: update/waas-quick-start.md#definitions - - linkListType: get-started - links: - - text: Servicing the Windows 10 operating system - url: update/waas-servicing-strategy-windows-10-updates.md - - - # Card (optional) - - title: Deployment planning - linkLists: - - linkListType: architecture - links: - - text: Create a deployment plan - url: update/create-deployment-plan.md - - text: Define readiness criteria - url: update/plan-define-readiness.md - - text: Evaluate infrastructure and tools - url: update/eval-infra-tools.md - - text: Determine application readiness - url: update/plan-determine-app-readiness.md - - text: Define your servicing strategy - url: update/waas-servicing-strategy-windows-10-updates.md - - # Card - - title: Prepare to deploy Windows 10 - linkLists: - - linkListType: how-to-guide - links: - - text: Prepare for Zero Touch Installation with Configuration Manager - url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md - - text: Prepare to deploy Windows 10 with MDT - url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md - - text: Evaluate and update infrastructure - url: update/update-policies.md - - text: Build a successful servicing strategy - url: update/waas-deployment-rings-windows-10-updates.md - - # Card - - title: Deploy and update Windows 10 - linkLists: - - linkListType: deploy - links: - - text: Windows Autopilot scenarios and capabilities - url: windows-autopilot/windows-autopilot-scenarios.md - - text: Deploy Windows 10 to a new device with Configuration Manager - url: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md - - text: Deploy a Windows 10 image using MDT - url: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md - - text: Assign devices to servicing channels - url: update/waas-servicing-channels-windows-10-updates.md - - text: Deploy Windows 10 updates - url: update/waas-servicing-channels-windows-10-updates.md - - text: Resolve Windows 10 upgrade errors - url: upgrade/resolve-windows-10-upgrade-errors.md - - # Card (optional) - - title: Windows 10 resources - linkLists: - - linkListType: learn - links: - - text: Windows 10 release information - url: https://docs.microsoft.com/windows/release-information/ - - text: What's new in Windows 10 - url: https://docs.microsoft.com/windows/whats-new/ - - text: Windows 10 Enterprise Security - url: https://docs.microsoft.com/windows/security/ - - text: Desktop Deployment Center - url: https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home -