Merge branch 'master' into nimishasatapathy-4852875-phase2

.openpublishing.redirection.json

@@ -18769,6 +18769,16 @@
       "source_path": "windows/security/threat-protection/microsoft-defender-antivirus/manage-updates-baselines-microsoft-defender-antivirus.md",
       "redirect_url": "/microsoft-365/security/defender-endpoint/manage-updates-baselines-microsoft-defender-antivirus",
       "redirect_document_id": false
-    }     
+    },
+    {
+      "source_path": "windows/security/threat-protection/device-control/control-usb-devices-using-intune.md",
+      "redirect_url": "/microsoft-365/security/defender-endpoint/control-usb-devices-using-intune",
+      "redirect_document_id": false
+    }, 
+    {
+      "source_path": "windows/security/threat-protection/device-control/device-control-report.md",
+      "redirect_url": "/microsoft-365/security/defender-endpoint/device-control-report",
+      "redirect_document_id": false
+    }    
 	    ]
 }

bcs/TOC.yml

@@ -0,0 +1,2 @@
+- name: Index
+  href: index.md

browsers/TOC.yml

@@ -0,0 +1,6 @@
+- name: Table of Contents
+  items: 
+    - name: Microsoft Edge
+      href: edge/index.md
+    - name: Internet Explorer 11
+      href: internet-explorer/index.md

browsers/edge/TOC.yml

@@ -0,0 +1,50 @@
+- name: Microsoft Edge deployment for IT Pros
+  href: index.yml
+  items: 
+    - name: System requirements and supported languages
+      href: about-microsoft-edge.md
+    - name: Use Enterprise Mode to improve compatibility
+      href: emie-to-improve-compatibility.md
+    - name: Deploy Microsoft Edge kiosk mode
+      href: microsoft-edge-kiosk-mode-deploy.md
+    - name: Group policies & configuration options
+      href: group-policies/index.yml
+      items: 
+        - name: Address bar
+          href: group-policies/address-bar-settings-gp.md
+        - name: Adobe Flash
+          href: group-policies/adobe-settings-gp.md
+        - name: Books Library
+          href: group-policies/books-library-management-gp.md
+        - name: Browser experience
+          href: group-policies/browser-settings-management-gp.md
+        - name: Developer tools
+          href: group-policies/developer-settings-gp.md
+        - name: Extensions
+          href: group-policies/extensions-management-gp.md
+        - name: Favorites
+          href: group-policies/favorites-management-gp.md
+        - name: Home button
+          href: group-policies/home-button-gp.md
+        - name: Interoperability and enterprise mode guidance
+          href: group-policies/interoperability-enterprise-guidance-gp.md
+        - name: Kiosk mode deployment in Microsoft Edge
+          href: microsoft-edge-kiosk-mode-deploy.md
+        - name: New Tab page
+          href: group-policies/new-tab-page-settings-gp.md
+        - name: Prelaunch Microsoft Edge and preload tabs
+          href: group-policies/prelaunch-preload-gp.md
+        - name: Search engine customization
+          href: group-policies/search-engine-customization-gp.md
+        - name: Security and privacy
+          href: group-policies/security-privacy-management-gp.md
+        - name: Start page
+          href: group-policies/start-pages-gp.md
+        - name: Sync browser
+          href: group-policies/sync-browser-settings-gp.md
+        - name: Telemetry and data collection
+          href: group-policies/telemetry-management-gp.md
+    - name: Change history for Microsoft Edge
+      href: change-history-for-microsoft-edge.md
+    - name: Microsoft Edge Frequently Asked Questions (FAQ)
+      href: microsoft-edge-faq.yml

browsers/edge/emie-to-improve-compatibility.md

@@ -27,8 +27,32 @@ If you have specific websites and apps that have compatibility problems with Mic
 
 Using Enterprise Mode means that you can continue to use Microsoft Edge as your default browser, while also ensuring that your apps continue working on IE11.
 
+## Interoperability goals and enterprise guidance
 
-[!INCLUDE [interoperability-goals-enterprise-guidance](../includes/interoperability-goals-enterprise-guidance.md)]
+Our primary goal is that your websites work in Microsoft Edge. To that end, we've made Microsoft Edge the default browser.
+
+You must continue using IE11 if web apps use any of the following:
+
+* ActiveX controls
+
+* x-ua-compatible headers
+
+* <meta> tags with an http-equivalent value of X-UA-Compatible header
+
+* Enterprise mode or compatibility view to addressing compatibility issues
+
+* legacy document modes
+
+If you have uninstalled IE11, you can download it from the Microsoft Store or the [Internet Explorer 11 download page](https://go.microsoft.com/fwlink/p/?linkid=290956). Alternatively, you can use Enterprise Mode with Microsoft Edge to transition only the sites that need these technologies to load in IE11. 
+
+> [!TIP]
+> If you want to use Group Policy to set Internet Explorer as your default browser, you can find the info here, [Set the default browser using Group Policy](https://go.microsoft.com/fwlink/p/?LinkId=620714).  
+
+|Technology  |Why it existed  |Why we don't need it anymore  |
+|---------|---------|---------|
+|ActiveX     |ActiveX is a binary extension model introduced in 1996 which allowed developers to embed native Windows technologies (COM/OLE) in web pages. These controls can be downloaded and installed from a site and were subsequently loaded in-process and rendered in Internet Explorer.         |         |
+|Browser Helper Objects (BHO)     |BHOs are a binary extension model introduced in 1997 which enabled developers to write COM objects that were loaded in-process with the browser and could perform actions on available windows and modules. A common use was to build toolbars that installed into Internet Explorer.         |         |
+|Document modes     | Starting with IE8, Internet Explorer introduced a new “document mode” with every release. These document modes could be requested via the x-ua-compatible header to put the browser into a mode which emulates legacy versions.        |Similar to other modern browsers, Microsoft Edge has a single “living” document mode. To minimize the compatibility burden, we test features behind switches in about:flags until stable and ready to be turned on by default.         |
 
 ## Enterprise guidance
 Microsoft Edge is the default browser experience for Windows 10 and Windows 10 Mobile. However, if you're running web apps that rely on ActiveX controls, continue using Internet Explorer 11 for the web apps to work correctly. If you don't have IE11 installed anymore, you can download it from the Microsoft Store or the [Internet Explorer 11 download page](https://go.microsoft.com/fwlink/p/?linkid=290956). Also, if you use an earlier version of Internet Explorer, upgrade to IE11.