diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index a98cbcca08..8d507ba71a 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -16439,6 +16439,11 @@
"source_path": "windows/deployment/windows-autopilot/windows-autopilot.md",
"redirect_url": "https://docs.microsoft.com/mem/autopilot/windows-autopilot",
"redirect_document_id": true
+ },
+ {
+ "source_path": "windows/hub/windows-10.yml",
+ "redirect_url": "https://docs.microsoft.com/windows/windows-10",
+ "redirect_document_id": false
}
]
}
diff --git a/windows/hub/TOC.md b/windows/hub/TOC.md
index 1b9bb407c6..25ef07d002 100644
--- a/windows/hub/TOC.md
+++ b/windows/hub/TOC.md
@@ -1,4 +1,4 @@
-# [Windows 10](index.md)
+# [Windows 10](index.yml)
## [What's new](/windows/whats-new)
## [Release information](/windows/release-information)
## [Deployment](/windows/deployment)
diff --git a/windows/hub/index.md b/windows/hub/index.md
deleted file mode 100644
index b34eb9cf48..0000000000
--- a/windows/hub/index.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: Windows 10
-description: Find the latest how to and support content that IT pros need to evaluate, plan, deploy, secure and manage devices running Windows 10.
-ms.assetid: 345A4B4E-BC1B-4F5C-9E90-58E647D11C60
-ms.prod: w10
-ms.localizationpriority: high
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.author: dansimp
-author: dansimp
-ms.reviewer: dansimp
-manager: dansimp
----
-
-# Windows 10
-
-Find the latest how to and support content that IT pros need to evaluate, plan, deploy, secure and manage devices running Windows 10.
-
-
-
-## Check out [what's new in Windows 10, version 2004](/windows/whats-new/whats-new-windows-10-version-2004).
-
-
-
->[!TIP]
-> Looking for information about older versions of Windows? Check out our other [Windows libraries](/previous-versions/windows/) on docs.microsoft.com. You can also search this site to find specific information, like this [Windows 8.1 content](https://docs.microsoft.com/search/index?search=Windows+8.1&dataSource=previousVersions).
-
-## Get to know Windows as a Service (WaaS)
-
-The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers.
-
-These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
-
-- [Read more about Windows as a Service](/windows/deployment/update/waas-overview)
\ No newline at end of file
diff --git a/windows/hub/index.yml b/windows/hub/index.yml
new file mode 100644
index 0000000000..0ac1aa5523
--- /dev/null
+++ b/windows/hub/index.yml
@@ -0,0 +1,115 @@
+### YamlMime:Landing
+
+title: Windows 10 resources and documentation for IT Pros # < 60 chars
+summary: Plan, deploy, secure, and manage devices running Windows 10. # < 160 chars
+
+metadata:
+ title: Windows 10 documentation for IT Pros # Required; page title displayed in search results. Include the brand. < 60 chars.
+ description: Evaluate, plan, deploy, secure and manage devices running Windows 10. # 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: 09/23/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: What's new
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: What's new in Windows 10, version 2004
+ url: /windows/whats-new/whats-new-windows-10-version-2004
+ - text: What's new in Windows 10, version 1909
+ url: /windows/whats-new/whats-new-windows-10-version-1909
+ - text: What's new in Windows 10, version 1903
+ url: /windows/whats-new/whats-new-windows-10-version-1903
+ - text: Windows 10 release information
+ url: https://docs.microsoft.com/windows/release-information/
+
+ # Card (optional)
+ - title: Configuration
+ linkLists:
+ - linkListType: how-to-guide
+ links:
+ - text: Configure Windows 10
+ url: /windows/configuration/index
+ - text: Accesasibility information for IT Pros
+ url: /windows/configuration/windows-10-accessibility-for-itpros
+ - text: Configure access to Microsoft Store
+ url: /windows/configuration/stop-employees-from-using-microsoft-store
+ - text: Set up a shared or guest PC
+ url: /windows/configuration/set-up-shared-or-guest-pc
+
+ # Card (optional)
+ - title: Deployment
+ linkLists:
+ - linkListType: deploy
+ links:
+ - text: Deploy and update Windows 10
+ url: /windows/deployment/index
+ - text: Windows 10 deployment scenarios
+ url: /windows/deployment/windows-10-deployment-scenarios
+ - text: Create a deployment plan
+ url: /windows/deployment/update/create-deployment-plan
+ - text: Prepare to deploy Windows 10
+ url: /windows/deployment/update/prepare-deploy-windows
+
+
+ # Card
+ - title: App management
+ linkLists:
+ - linkListType: how-to-guide
+ links:
+ - text: Windows 10 application management
+ url: /windows/application-management/index
+ - text: Understand the different apps included in Windows 10
+ url: /windows/application-management/apps-in-windows-10
+ - text: Get started with App-V for Windows 10
+ url: /windows/application-management/app-v/appv-getting-started
+ - text: Keep removed apps from returning during an update
+ url: /windows/application-management/remove-provisioned-apps-during-update
+
+ # Card
+ - title: Client management
+ linkLists:
+ - linkListType: how-to-guide
+ links:
+ - text: Windows 10 client management
+ url: /windows/client-management/index
+ - text: Administrative tools in Windows 10
+ url: /windows/client-management/administrative-tools-in-windows-10
+ - text: Create mandatory user profiles
+ url: /windows/client-management/mandatory-user-profile
+ - text: New policies for Windows 10
+ url: /windows/client-management/new-policies-for-windows-10
+
+ # Card (optional)
+ - title: Security and Privacy
+ linkLists:
+ - linkListType: how-to-guide
+ links:
+ - text: Windows 10 Enterprise Security
+ url: /windows/security/index
+ - text: Windows Privacy
+ url: /windows/privacy/index
+ - text: Identity and access management
+ url: /windows/security/identity-protection/index
+ - text: Threat protection
+ url: /windows/security/threat-protection/index
+ - text: Information protection
+ url: /windows/security/information-protection/index
+ - text: Required diagnostic data
+ url: /windows/privacy/required-windows-diagnostic-data-events-and-fields-2004
+ - text: Optional diagnostic data
+ url: /windows/privacy/windows-diagnostic-data
+ - text: Changes to Windows diagnostic data collection
+ url: /windows/privacy/changes-to-windows-diagnostic-data-collection
diff --git a/windows/hub/windows-10.yml b/windows/hub/windows-10.yml
deleted file mode 100644
index 822259efbd..0000000000
--- a/windows/hub/windows-10.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-### YamlMime:YamlDocument
-
-documentType: LandingData
-title: Windows 10
-metadata:
- title: Windows 10
- description: Find tools, step-by-step guides, and other resources to help you deploy and support Windows 10 in your organization.
- keywords: Windows 10, issues, fixes, announcements, Windows Server, advisories
- ms.localizationpriority: medium
- author: lizap
- ms.author: elizapo
- manager: dougkim
- ms.topic: article
- ms.devlang: na
-
-sections:
-- items:
- - type: markdown
- text: "
- Find tools, step-by-step guides, and other resources to help you deploy and support Windows 10 in your organization.
- "
-- title: Explore
-- items:
- - type: markdown
- text: "
- Get started with Windows 10. Evaluate free for 90 days and set up virtual labs to test a proof of concept.
-  **Download a free 90-day evaluation** Try the latest features. Test your apps, hardware, and deployment strategies. Start evaluation |  **Get started with virtual labs** Try setup, deployment, and management scenarios in a virtual environment, with no additional software or setup required. See Windows 10 labs |  **Conduct a proof of concept** Download a lab environment with MDT, Configuration Manager, Windows 10, and more. Get deployment kit |
-
- "
-- title: What's new
-- items:
- - type: markdown
- text: "
- Learn about the latest releases and servicing options.
-
- "
-- title: Frequently asked questions
-- items:
- - type: markdown
- text: "
- Get answers to common questions, or get help with a specific problem.
-
- "
-- title: Plan
-- items:
- - type: markdown
- text: "
- Prepare to deploy Windows 10 in your organization. Explore deployment methods, compatibility tools, and servicing options.
-
- "
-- title: Deploy
-- items:
- - type: markdown
- text: "
- Download recommended tools and get step-by-step guidance for in-place upgrades, dynamic provisioning, or traditional deployments.
-
- "
-- title: Management and security
-- items:
- - type: markdown
- text: "
- Learn how to manage Windows 10 clients and apps, secure company data, and manage risk.
-
- "
-- title: Stay informed
-- items:
- - type: markdown
- text: "
- Stay connected with Windows 10 experts, your colleagues, business trends, and IT pro events.
-  **Sign up for the Windows IT Pro Insider** Find out about new resources and get expert tips and tricks on deployment, management, security, and more. Learn more |  **Follow us on Twitter** Keep up with the latest desktop and device trends, Windows news, and events for IT pros. Visit Twitter |  **Join the Windows Insider Program for Business** Get early access to new builds and provide feedback on the latest features and functionalities. Get started |
-
- "
diff --git a/windows/security/threat-protection/microsoft-defender-atp/exposed-apis-odata-samples.md b/windows/security/threat-protection/microsoft-defender-atp/exposed-apis-odata-samples.md
index 1e2be5f01f..e5f5fcad0b 100644
--- a/windows/security/threat-protection/microsoft-defender-atp/exposed-apis-odata-samples.md
+++ b/windows/security/threat-protection/microsoft-defender-atp/exposed-apis-odata-samples.md
@@ -41,7 +41,7 @@ Not all properties are filterable.
Get 10 latest Alerts with related Evidence
-```
+```http
HTTP GET https://api.securitycenter.microsoft.com/api/alerts?$top=10&$expand=evidence
```
@@ -147,9 +147,9 @@ HTTP GET https://api.securitycenter.microsoft.com/api/alerts?$top=10&$expand=ev
### Example 2
-Get all the alerts last updated after 2019-10-20 00:00:00
+Get all the alerts last updated after 2019-11-22 00:00:00
-```
+```http
HTTP GET https://api.securitycenter.windows.com/api/alerts?$filter=lastUpdateTime+ge+2019-11-22T00:00:00Z
```
@@ -205,7 +205,7 @@ HTTP GET https://api.securitycenter.windows.com/api/alerts?$filter=lastUpdateTi
Get all the devices with 'High' 'RiskScore'
-```
+```http
HTTP GET https://api.securitycenter.windows.com/api/machines?$filter=riskScore+eq+'High'
```
@@ -244,7 +244,7 @@ HTTP GET https://api.securitycenter.windows.com/api/machines?$filter=riskScore+
Get top 100 devices with 'HealthStatus' not equals to 'Active'
-```
+```http
HTTP GET https://api.securitycenter.windows.com/api/machines?$filter=healthStatus+ne+'Active'&$top=100
```
@@ -283,7 +283,7 @@ HTTP GET https://api.securitycenter.windows.com/api/machines?$filter=healthStat
Get all the devices that last seen after 2018-10-20
-```
+```http
HTTP GET https://api.securitycenter.windows.com/api/machines?$filter=lastSeen gt 2018-08-01Z
```
@@ -322,7 +322,7 @@ HTTP GET https://api.securitycenter.windows.com/api/machines?$filter=lastSeen g
Get all the Anti-Virus scans that the user Analyst@examples.onmicrosoft.com created using Microsoft Defender ATP
-```
+```http
HTTP GET https://api.securitycenter.windows.com/api/machineactions?$filter=requestor eq 'Analyst@contoso.com' and type eq 'RunAntiVirusScan'
```
@@ -354,7 +354,7 @@ json{
Get the count of open alerts for a specific device:
-```
+```http
HTTP GET https://api.securitycenter.windows.com/api/machines/123321d0c675eaa415b8e5f383c6388bff446c62/alerts/$count?$filter=status ne 'Resolved'
```
diff --git a/windows/security/threat-protection/windows-defender-security-center/oldTOC.md b/windows/security/threat-protection/windows-defender-security-center/oldTOC.md
deleted file mode 100644
index b2b028118b..0000000000
--- a/windows/security/threat-protection/windows-defender-security-center/oldTOC.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-ms.author: dansimp
-author: dansimp
-ms.prod: w10
-title: The Microsoft Defender Security Center app
----
-
-# [The Microsoft Defender Security Center app](windows-defender-security-center.md)
-
-## [Customize the Microsoft Defender Security Center app for your organization](wdsc-customize-contact-information.md)
-## [Hide Microsoft Defender Security Center app notifications](wdsc-hide-notifications.md)
-## [Manage Microsoft Defender Security Center in Windows 10 in S mode](wdsc-windows-10-in-s-mode.md)
-## [Virus and threat protection](wdsc-virus-threat-protection.md)
-## [Account protection](wdsc-account-protection.md)
-## [Firewall and network protection](wdsc-firewall-network-protection.md)
-## [App and browser control](wdsc-app-browser-control.md)
-## [Device security](wdsc-device-security.md)
-## [Device performance and health](wdsc-device-performance-health.md)
-## [Family options](wdsc-family-options.md)
-
-