Merge branch 'master' of https://github.com/MicrosoftDocs/windows-docs-pr into FromPrivateRepo

.openpublishing.redirection.json

@@ -14958,8 +14958,8 @@
 "redirect_document_id": true
 },
 {
-"source_path": "windows/windows/deployment/windows-10-enterprise-subscription-activation.md",
-"redirect_url": "/windows/windows/deployment/windows-10-subscription-activation",
+"source_path": "windows/deployment/windows-10-enterprise-subscription-activation.md",
+"redirect_url": "/windows/deployment/windows-10-subscription-activation",
 "redirect_document_id": true
 },
 {

devices/surface/TOC.md

@@ -29,7 +29,7 @@
 ### [Enroll and configure Surface devices with SEMM](enroll-and-configure-surface-devices-with-semm.md)
 ### [Unenroll Surface devices from SEMM](unenroll-surface-devices-from-semm.md)
 ### [Use System Center Configuration Manager to manage devices with SEMM](use-system-center-configuration-manager-to-manage-devices-with-semm.md)
-## [Fix common Surface device issues using the Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business-intro.md)
+## [Fix common Surface device issues using the Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-for-business-intro.md)
 ### [Deploy Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md)
 ### [Use Surface Diagnostic Toolkit for Business in desktop mode](surface-diagnostic-toolkit-desktop-mode.md)
 ### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md)

windows/deployment/planning/TOC.md

@@ -5,6 +5,7 @@
 ## [Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md)
 
 ## Features removed or planned for replacement
+### [Windows 10 features lifecycle](features-lifecycle.md)
 ### [Windows 10, version 1903](windows-10-1903-removed-features.md)
 ### [Windows 10, version 1809](windows-10-1809-removed-features.md)
 ### [Windows 10, version 1803](windows-10-1803-removed-features.md)

windows/deployment/planning/features-lifecycle.md

@@ -0,0 +1,38 @@
+---
+title: Windows 10 features lifecycle
+description: Learn about the lifecycle of Windows 10 features
+ms.prod: w10
+ms.mktglfcycl: plan
+ms.localizationpriority: medium
+ms.sitesec: library
+author: greg-lindsay
+ms.author: greglin
+ms.topic: article
+---
+# Windows 10 features lifecycle
+
+- Applies to: Windows 10
+
+Each release of Windows 10 contains many new and improved features. Occasionally we also remove features and functionality, usually because there is a better option.
+
+## Features removed or planned for replacement
+
+See the following for details about feature support for each release of Windows 10.
+
+[Windows 10, version 1903](windows-10-1903-removed-features.md)<br>
+[Windows 10, version 1809](windows-10-1809-removed-features.md)<br>
+[Windows 10, version 1803](windows-10-1803-removed-features.md)<br>
+[Windows 10, version 1709](windows-10-1709-removed-features.md)<br>
+[Windows 10, version 1703](windows-10-1703-removed-features.md)
+
+Also see: [Windows 10 release information](https://docs.microsoft.com/windows/release-information/)
+
+## Terminology
+
+The following terms can be used to describe the status that might be assigned to a feature during its lifecycle. 
+
+- **Deprecation**: The stage of the product lifecycle when a feature or functionality is no longer in active development and may be removed in future releases of a product or online service.
+- **End of support**: The stage of the product lifecycle when support and servicing are no longer available for a product.
+- **Retirement**: The stage of the product lifecycle when an online service is shut down so that it is no longer available for use.
+- **Remove or retire a feature**: The stage of the product lifecycle when a feature or functionality is removed from an online service after it has been deprecated.
+- **Replace a feature**: The stage of the product lifecycle when a feature or functionality in an online service is replaced with a different feature or functionality.

windows/privacy/diagnostic-data-viewer-overview.md

@@ -45,7 +45,7 @@ Before you can use this tool for viewing Windows diagnostic data, you must turn
 Download the app from the [Microsoft Store Diagnostic Data Viewer](https://www.microsoft.com/en-us/store/p/diagnostic-data-viewer/9n8wtrrsq8f7?rtc=1) page.
 
    >[!Important]
-   >It's possible that your Windows machine may not have the Microsoft Store available (e.g. Windows Server). If this is the case, please check out [Diagnostic Data Viewer for PowerShell](https://go.microsoft.com/fwlink/?linkid=2023830).
+   >It's possible that your Windows machine may not have the Microsoft Store available (e.g. Windows Server). If this is the case, please check out [Diagnostic Data Viewer for PowerShell](https://go.microsoft.com/fwlink/?linkid=2094264).
 
 ### Start the Diagnostic Data Viewer
 You can start this app from the **Settings** panel.