Merged PR 12585: 11/5 AM Publish

browsers/edge/about-microsoft-edge.md

@@ -5,6 +5,7 @@ ms.assetid: 70377735-b2f9-4b0b-9658-4cf7c1d745bb
 author: shortpatti
 ms.prod: edge
 ms.mktglfcycl: general
+ms.topic: reference
 ms.sitesec: library
 title: Microsoft Edge for IT Pros
 ms.localizationpriority: medium

browsers/edge/available-policies.md

@@ -6,6 +6,7 @@ ms.author: pashort
 manager: dougkim
 ms.prod: edge
 ms.mktglfcycl: explore
+ms.topic: reference
 ms.sitesec: library
 title: Group Policy and Mobile Device Management settings for Microsoft Edge (Microsoft Edge for IT Pros)
 ms.localizationpriority: medium

browsers/edge/change-history-for-microsoft-edge.md

@@ -2,6 +2,7 @@
 title: Change history for Microsoft Edge (Microsoft Edge for IT Pros)
 description: Discover what's new and updated in the Microsoft Edge for both Windows 10 and Windows 10 Mobile.
 ms.prod: edge
+ms.topic: reference
 ms.mktglfcycl: explore
 ms.sitesec: library
 ms.localizationpriority: medium

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

@@ -5,6 +5,7 @@ author: shortpatti
 ms.author: pashort
 ms.manager: dougkim
 ms.prod: browser-edge
+ms.topic: reference
 ms.mktglfcycl: support
 ms.sitesec: library
 ms.pagetype: appcompat

browsers/edge/group-policies/address-bar-settings-gp.md

@@ -8,7 +8,7 @@ manager: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/adobe-settings-gp.md

@@ -8,7 +8,7 @@ manager: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/books-library-management-gp.md

@@ -8,7 +8,7 @@ manager: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/browser-settings-management-gp.md

@@ -8,7 +8,7 @@ manager: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/developer-settings-gp.md

@@ -8,7 +8,7 @@ managre: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/extensions-management-gp.md

@@ -8,7 +8,7 @@ manager: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/favorites-management-gp.md

@@ -8,7 +8,7 @@ manager: dougkim
 author: shortpatti
 ms.author: pashort
 ms.date: 10/02/2018
-ms.topic: article
+ms.topic: reference
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library

browsers/edge/group-policies/home-button-gp.md

@@ -9,6 +9,7 @@ ms.localizationpriority: medium
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library
+ms.topic: reference
 ---
 
 # Home button 

browsers/edge/group-policies/interoperability-enterprise-guidance-gp.md

@@ -9,6 +9,7 @@ ms.date: 10/02/2018
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library
+ms.topic: reference
 ---
 
 # Interoperability and enterprise mode guidance

browsers/edge/group-policies/new-tab-page-settings-gp.md

@@ -9,6 +9,7 @@ ms.localizationpriority: medium
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library
+ms.topic: reference
 ---
 
 

browsers/edge/group-policies/prelaunch-preload-gp.md

@@ -6,6 +6,7 @@ ms.author: pashort
 author: shortpatti
 ms.date: 10/02/2018
 ms.localizationpriority: medium
+ms.topic: reference
 ---
 
 # Prelaunch Microsoft Edge and preload tabs in the background 
@@ -18,7 +19,7 @@ Additionally, Microsoft Edge preloads the Start and New Tab pages during Windows
 ## Relevant group policies
 
 - [Allow Microsoft Edge to pre-launch at Windows startup, when the system is idle, and each time Microsoft Edge is closed](#allow-microsoft-edge-to-pre-launch-at-windows-startup-when-the-system-is-idle-and-each-time-microsoft-edge-is-closed)
-- [Allow Microsoft Edge to load the Start and New Tab page at Windows startup and each time Microsoft Edge is closed](#allow-microsoft-edge-to-start-and-load-the-start-and-new-tab-page-at-windows-startup-and-each-time-microsoft-edge-is-closed)
+- [Allow Microsoft Edge to load the Start and New Tab page at Windows startup and each time Microsoft Edge is closed](#allow-microsoft-edge-to-load-the-start-and-new-tab-page-at-windows-startup-and-each-time-microsoft-edge-is-closed)
 
 You can find the Microsoft Edge Group Policy settings in the following location of the Group Policy Editor unless otherwise noted in the policy:
 

browsers/edge/group-policies/search-engine-customization-gp.md

@@ -6,6 +6,7 @@ ms.author: pashort
 author: shortpatti
 ms.date: 10/02/2018
 ms.localizationpriority: medium
+ms.topic: reference
 ---
 
 # Search engine customization 

browsers/edge/group-policies/security-privacy-management-gp.md

@@ -6,6 +6,7 @@ ms.author: pashort
 author: shortpatti
 ms.date: 10/02/2018
 ms.localizationpriority: medium
+ms.topic: reference
 ---
 
 # Security and privacy 
@@ -57,12 +58,12 @@ Microsoft Edge addresses these threats to help make browsing the web a safer exp
 
 | Feature | Description |
 |---|---|
-| **[Windows Hello](http://blogs.windows.com/bloggingwindows/2015/03/17/making-windows-10-more-personal-and-more-secure-with-windows-hello/)** | Microsoft Edge is the first browser to natively support Windows Hello to authenticate the user and the website with asymmetric cryptography technology, powered by early implementation of the [Web Authentication (formerly FIDO 2.0 Web API) specification](http://w3c.github.io/webauthn/). |
+| **[Windows Hello](https://blogs.windows.com/bloggingwindows/2015/03/17/making-windows-10-more-personal-and-more-secure-with-windows-hello/)** | Microsoft Edge is the first browser to natively support Windows Hello to authenticate the user and the website with asymmetric cryptography technology, powered by early implementation of the [Web Authentication (formerly FIDO 2.0 Web API) specification](https://w3c.github.io/webauthn/). |
 | **Microsoft SmartScreen** | Defends against phishing by performing reputation checks on sites visited and blocking any sites that are thought to be a phishing site. SmartScreen also helps to defend against installing malicious software, drive-by attacks, or file downloads, even from trusted sites. Drive-by attacks are malicious web-based attacks that compromise your system by targeting security vulnerabilities in commonly used software and may be hosted on trusted sites. |
 | **Certificate Reputation system** | Collects data about certificates in use, detecting new certificates and flagging fraudulent certificates automatically, and sends the data to Microsoft. The systems and tools in place include<ul><li>Certificate Reputation system: Protects users from fraudulent certificates.</li><li>Bing Webmaster Tools (for developers): Reports fake certificates directly to Microsoft.</li></ul> |
 | **Microsoft EdgeHTML and modern web standards** | Microsoft Edge uses Microsoft EdgeHTML as the rendering engine. This engine focuses on modern standards letting web developers build and maintain a consistent site across all modern browsers.  It also helps to defend against hacking through these security standards features:<ul><li>Support for the W3C standard for [Content Security Policy (CSP)](https://developer.microsoft.com/microsoft-edge/platform/documentation/dev-guide/security/content-Security-Policy), which can help web developers defend their sites against cross-site scripting attacks.</li><li> Support for the [HTTP Strict Transport Security (HSTS)](https://developer.microsoft.com/microsoft-edge/platform/documentation/dev-guide/security/HSTS/) security feature (IETF-standard compliant). HSTS helps ensure that connections to important sites, such as to your bank, are always secured.</li></ul><p>**NOTE:** Both Microsoft Edge and Internet Explorer 11 support HSTS. |
 | **Code integrity and image loading restrictions** | Microsoft Edge content processes support code integrity and image load restrictions, helping to prevent malicious DLLs from loading or injecting into the content processes. Only [properly signed images](https://blogs.windows.com/msedgedev/2015/11/17/microsoft-edge-module-code-integrity/) are allowed to load into Microsoft Edge. Binaries on remote devices (such as UNC or WebDAV) can’t load. |
-| **Memory corruption mitigations** | Memory corruption attacks frequently happen to apps written in C or C++ don’t provide safety or buffer overflow protection.  When an attacker provides malformed input to a program, the program’s memory becomes corrupt allowing the attacker to take control of the program. Although attackers have adapted and invented new ways to attack, we’ve responded with memory safety defenses, mitigating the most common forms of attack, including and especially [use-after-free (UAF)](http://cwe.mitre.org/data/definitions/416.html) vulnerabilities. |
+| **Memory corruption mitigations** | Memory corruption attacks frequently happen to apps written in C or C++ don’t provide safety or buffer overflow protection.  When an attacker provides malformed input to a program, the program’s memory becomes corrupt allowing the attacker to take control of the program. Although attackers have adapted and invented new ways to attack, we’ve responded with memory safety defenses, mitigating the most common forms of attack, including and especially [use-after-free (UAF)](https://cwe.mitre.org/data/definitions/416.html) vulnerabilities. |
 | **Memory Garbage Collector (MemGC) mitigation** | MemGC replaces Memory Protector and helps to protect the browser from UAF vulnerabilities.  MemGC frees up memory from the programmer and automating it. Only freeing memory when the automation detects no references left pointing to a given block of memory.   |
 | **Control Flow Guard** | Attackers use memory corruption attacks to gain control of the CPU program counter to jump to any code location they want. Control Flow Guard, a Microsoft Visual Studio technology, compiles checks around code that performs indirect jumps based on a pointer. Those jumps get restricted to function entry points with known addresses only making attacker take-overs must more difficult constraining where an attack jumps.  |
 | **All web content runs in an app container sandbox** |Microsoft Edge takes the sandbox even farther, running its content processes in containers not just by default, but all of the time. Microsoft Edge doesn’t support 3rd party binary extensions, so there is no reason for it to run outside of the container, making Microsoft Edge more secure.  |

browsers/edge/group-policies/start-pages-gp.md

@@ -9,6 +9,7 @@ ms.date: 10/02/2018
 ms.prod: edge
 ms.mktglfcycl: explore
 ms.sitesec: library
+ms.topic: reference
 ---
 
 # Start pages 

browsers/edge/group-policies/sync-browser-settings-gp.md

@@ -6,6 +6,7 @@ ms.author: pashort
 author: shortpatti
 ms.date: 10/02/2018
 ms.localizationpriority: medium
+ms.topic: reference
 ---
 
 # Sync browser settings  

browsers/edge/group-policies/telemetry-management-gp.md

@@ -6,6 +6,7 @@ ms.author: pashort
 author: shortpatti
 ms.date: 10/02/2018
 ms.localizationpriority: medium
+ms.topic: reference
 ---
 
 # Telemetry and data collection 

browsers/edge/includes/allow-web-content-new-tab-page-include.md

@@ -1,7 +1,7 @@
 ---
 author: shortpatti
 ms.author: pashort
-ms.date:  10/26/2018
+ms.date:  11/02/2018
 ms.prod: edge
 ms:topic: include
 ---
@@ -18,9 +18,8 @@ ms:topic: include
 
 |Group Policy  |MDM |Registry |Description |
 |---|:---:|:---:|---|
-|Not configured |Blank |Blank |Users can choose what loads on the New Tab page. | 
+|Disabled |0 |0 |Load a blank page instead of the default New Tab page and prevent users from making changes. | 
-|Disabled |0 |0 |Load a blank page instead of the default New Tab page and prevent users from changing it. | 
+|Enabled or not configured **(default)** |1 |1 |Load the default New Tab page and the users make changes. | 
-|Enabled **(default)** |1 |1 |Load the default New Tab page. | 
 ---
 
 ### ADMX info and settings

browsers/edge/includes/provision-favorites-include.md

@@ -21,7 +21,7 @@ ms:topic: include
 |Group Policy  |Description |Most restricted |
 |---|---|:---:|
 |Disabled or not configured<br>**(default)** |Users can customize the favorites list, such as adding folders, or adding and removing favorites. | |
-|Enabled |Define a default list of favorites in Microsoft Edge. In this case, the Save a Favorite, Import settings, and context menu options (such as Create a new folder) are turned off.<p>To define a default list of favorites, do the following:<ol><li>In the upper-right corner of Microsoft Edge, click the ellipses (**...**) and select **Settings**.</li><li>Click **Import from another browser**, click **Export to file** and save the file.</li><li>In the **Options** section of the Group Policy Editor, provide the location that points the file with the list of favorites to provision.  Specify the URL as: <ul><li>HTTP location: "SiteList"=http://localhost:8080/URLs.html</li><li>Local network: "SiteList"="\network\shares\URLs.html"</li><li>Local file: "SiteList"=file:///c:/Users/Documents/URLs.html</li></ul></li></ol> |![Most restricted value](../images/check-gn.png) | 
+|Enabled |Define a default list of favorites in Microsoft Edge. In this case, the Save a Favorite, Import settings, and context menu options (such as Create a new folder) are turned off.<p>To define a default list of favorites, do the following:<ol><li>In the upper-right corner of Microsoft Edge, click the ellipses (**...**) and select **Settings**.</li><li>Click **Import from another browser**, click **Export to file** and save the file.</li><li>In the **Options** section of the Group Policy Editor, provide the location that points the file with the list of favorites to provision.  Specify the URL as: <ul><li>HTTP location: "SiteList"=https://localhost:8080/URLs.html</li><li>Local network: "SiteList"="\network\shares\URLs.html"</li><li>Local file: "SiteList"=file:///c:/Users/Documents/URLs.html</li></ul></li></ol> |![Most restricted value](../images/check-gn.png) | 
 ---
 
 ### ADMX info and settings

browsers/edge/microsoft-edge-faq.md

@@ -4,10 +4,11 @@ description: Answers to frequently asked questions about Microsoft Edge features
 author: shortpatti
 ms.author: pashort
 ms.prod: edge
+ms.topic: reference
 ms.mktglfcycl: general
 ms.sitesec: library
 ms.localizationpriority: medium
-ms.date: 10/23/2018
+ms.date: 11/05/2018
 ---
 
 # Frequently Asked Questions (FAQs) for IT Pros
@@ -32,7 +33,7 @@ For more information on how Internet Explorer and Microsoft Edge can work togeth
 
 **Q: Does Microsoft Edge work with Enterprise Mode?**
 
-**A:** [Enterprise Mode](https://docs.microsoft.com/internet-explorer/ie11-deploy-guide/enterprise-mode-overview-for-ie11) offers better backward compatibility and enables customers to run many legacy web applications. Microsoft Edge and Internet Explorer can be configured to use the same Enterprise Mode Site List, switching seamlessly between browsers to support both modern and legacy web apps. For guidance and additional resources, please visit the [Microsoft Edge IT Center](https://technet.microsoft.com/microsoft-edge).
+**A:** [Enterprise Mode](https://docs.microsoft.com/internet-explorer/ie11-deploy-guide/enterprise-mode-overview-for-ie11) offers better backward compatibility and enables customers to run many legacy web applications. Microsoft Edge and Internet Explorer can be configured to use the same Enterprise Mode Site List, switching seamlessly between browsers to support both modern and legacy web apps. 
 
 
 **Q: I have Windows 10, but I don’t seem to have Microsoft Edge. Why?**
@@ -41,7 +42,7 @@ For more information on how Internet Explorer and Microsoft Edge can work togeth
 
 **Q: How do I get the latest Canary/Beta/Preview version of Microsoft Edge?**
 
-**A:** You can access the latest preview version of Microsoft Edge by updating to the latest Windows 10 preview via the [Windows Insider Program](https://insider.windows.com/). To run the preview version of Microsoft Edge on a stable version of Windows 10 (or any other OS), you can download a [Virtual Machine](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/windows/) that we provide or use the upcoming RemoteEdge service.
+**A:** You can access the latest preview version of Microsoft Edge by updating to the latest Windows 10 preview via the [Windows Insider Program](https://insider.windows.com/). To run the preview version of Microsoft Edge on a stable version of Windows 10 (or any other OS), you can download a [Virtual Machine](https://developer.microsoft.com/microsoft-edge/tools/vms/windows/) that we provide or use the upcoming RemoteEdge service.
 
 **Q: How do I customize Microsoft Edge and related settings for my organization?**
 
@@ -49,7 +50,9 @@ For more information on how Internet Explorer and Microsoft Edge can work togeth
 
 **Q: Is Adobe Flash supported in Microsoft Edge?**
 
-**A:** Currently, Adobe Flash is supported as a built-in feature of Microsoft Edge on devices running the desktop version of Windows 10. In July 2017, Adobe announced that Flash will no longer be supported after 2020. With Adobe no longer supporting Flash after 2020, Microsoft has started to phase out Flash from Microsoft Edge by adding the [Configure the Adobe Flash Click-to-Run setting](#configure-the-adobe-flash-click-to-run-setting) group policy giving you a way to control the list of websites that have permission to run Adobe Flash content.
+**A:** Currently, Adobe Flash is supported as a built-in feature of Microsoft Edge on devices running the desktop version of Windows 10. In July 2017, Adobe announced that Flash will no longer be supported after 2020. With Adobe no longer supporting Flash after 2020, Microsoft has started to phase out Flash from Microsoft Edge by adding the [Configure the Adobe Flash Click-to-Run setting](available-policies.md#configure-the-adobe-flash-click-to-run-setting) group policy giving you a way to control the list of websites that have permission to run Adobe Flash content.
+
+
 
 To learn more about Microsoft’s plan for phasing out Flash from Microsoft Edge and Internet Explorer, see [The End of an Era — Next Steps for Adobe Flash]( https://blogs.windows.com/msedgedev/2017/07/25/flash-on-windows-timeline/#3Bcc3QjRw0l7XsZ4.97) (blog article). 
 

browsers/edge/microsoft-edge-kiosk-mode-deploy.md

@@ -1,11 +1,12 @@
 ---
+title: Deploy Microsoft Edge kiosk mode
 description: Microsoft Edge kiosk mode works with assigned access to allow IT admins to create a tailored browsing experience designed for kiosk devices. To use Microsoft Edge kiosk mode, you must configure Microsoft Edge as an application in assigned access.
 ms.assetid: 
 author: shortpatti
 ms.author: pashort
 ms.prod: edge
 ms.sitesec: library
-title: Deploy Microsoft Edge kiosk mode
+ms.topic: get-started-article
 ms.localizationpriority: medium
 ms.date: 10/29/2018 
 ---

browsers/edge/shortdesc/allow-web-content-on-new-tab-page-shortdesc.md

@@ -1,9 +1,9 @@
 ---
 author: shortpatti
 ms.author: pashort
-ms.date:  10/02/2018
+ms.date:  11/02/2018
 ms.prod: edge
 ms:topic: include
 ---
 
-By default, Microsoft Edge loads the default New Tab page. Disabling this policy loads a blank page instead of the New Tab page and prevents users from changing it. Not configuring this policy lets users choose what loads on the New Tab page.
+By default, Microsoft Edge loads the default New Tab page and lets the users make changes. If you disable this policy, a blank page loads instead of the New Tab page and prevents users from changing it. 

browsers/enterprise-mode/add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md

@@ -33,7 +33,7 @@ You can add individual sites to your compatibility list by using the Enterprise
 1.  In the Enterprise Mode Site List Manager (schema v.1), click **Add**.
 
 2.  Type the URL for the website that’s experiencing compatibility problems, like *&lt;domain&gt;.com* or *&lt;domain&gt;.com*/*&lt;path&gt;* into the **URL** box.<p>
-Don't include the `http://` or `https://` designation. The tool automatically tries both versions during validation.
+Don't include the `https://` or `https://` designation. The tool automatically tries both versions during validation.
 
 3.  Type any comments about the website into the **Notes about URL** box.<p>
 Administrators can only see comments while they’re in this tool.

browsers/enterprise-mode/add-single-sites-to-enterprise-mode-site-list-using-the-version-2-enterprise-mode-tool.md

@@ -33,7 +33,7 @@ You can add individual sites to your compatibility list by using the Enterprise
 1.  In the Enterprise Mode Site List Manager (schema v.2), click **Add**.
 
 2.  Type the URL for the website that’s experiencing compatibility problems, like *&lt;domain&gt;.com* or *&lt;domain&gt;.com*/*&lt;path&gt;* into the **URL** box.<p>
-Don't include the `http://` or `https://` designation. The tool automatically tries both versions during validation.
+Don't include the `https://` or `https://` designation. The tool automatically tries both versions during validation.
 
 3.  Type any comments about the website into the **Notes about URL** box.<p>
 Administrators can only see comments while they’re in this tool.

browsers/enterprise-mode/create-change-request-enterprise-mode-portal.md

@@ -50,7 +50,7 @@ Employees assigned to the Requester role can create a change request. A change r
 
     - **Business impact (optional).** An optional area where you can provide info about the business impact of this app and the change.
 
-    - **App location (URL).** The full URL location to the app, starting with http:// or https://.
+    - **App location (URL).** The full URL location to the app, starting with https:// or https://.
 
     - **App best viewed in.** Select the best browser experience for the app. This can be Internet Explorer 5 through Internet Explorer 11 or one of the IE7Enterprise or IE8Enterprise modes.
 

browsers/enterprise-mode/enterprise-mode-schema-version-1-guidance.md

@@ -28,7 +28,7 @@ If you don't want to use the Enterprise Mode Site List Manager, you also have th
 The following is an example of the Enterprise Mode schema v.1. This schema can run on devices running Windows 7 and Windows 8.1.
 
 **Important**<br>
-Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<domain>contoso.com</domain>` automatically applies to both http://contoso.com and https://contoso.com.
+Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<domain>contoso.com</domain>` automatically applies to both https://contoso.com and https://contoso.com.
 
 ``` xml
 <rules version="1">
@@ -135,7 +135,7 @@ This table includes the elements used by the Enterprise Mode schema.
     &lt;path exclude="true"&gt;/products&lt;/path&gt;
   &lt;/domain&gt;
 &lt;/emie&gt;</pre><p>
-Where http://fabrikam.com doesn't use IE8 Enterprise Mode, but http://fabrikam.com/products does.</td>
+Where https://fabrikam.com doesn't use IE8 Enterprise Mode, but https://fabrikam.com/products does.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 </table>
@@ -167,7 +167,7 @@ This table includes the attributes used by the Enterprise Mode schema.
     &lt;path exclude="true"&gt;/products&lt;/path&gt;
   &lt;/domain&gt;
 &lt;/emie&gt;</pre><p>
-Where http://fabrikam.com doesn't use IE8 Enterprise Mode, but http://fabrikam.com/products does.</td>
+Where https://fabrikam.com doesn't use IE8 Enterprise Mode, but https://fabrikam.com/products does.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 <tr>
@@ -203,7 +203,7 @@ For example, say you want all of the sites in the contoso.com domain to open usi
 
 ### What not to include in your schema
 We recommend that you not add any of the following items to your schema because they can make your compatibility list behave in unexpected ways:
-- Don’t use protocols. For example, `http://`, `https://`, or custom protocols. They break parsing.
+- Don’t use protocols. For example, `https://`, `https://`, or custom protocols. They break parsing.
 - Don’t use wildcards.
 - Don’t use query strings, ampersands break parsing.
 

browsers/enterprise-mode/enterprise-mode-schema-version-2-guidance.md

@@ -38,7 +38,7 @@ You can continue to use the v.1 version of the schema on Windows 10, but you wo
 The following is an example of the v.2 version of the Enterprise Mode schema.
 
 **Important**<br>
-Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<url="contoso.com">`, automatically applies to both http://contoso.com and https://contoso.com.
+Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<url="contoso.com">`, automatically applies to both https://contoso.com and https://contoso.com.
  
 ``` xml
 <site-list version="205">
@@ -198,7 +198,7 @@ The &lt;url&gt; attribute, as part of the &lt;site&gt; element in the v.2 versio
 &lt;site url="contoso.com/travel"&gt;
   &lt;open-in allow-redirect="true"&gt;IE11&lt;/open-in&gt;
 &lt;/site&gt;</pre>
-In this example, if http://contoso.com/travel is encountered in a redirect chain in Microsoft Edge, it will be opened in Internet Explorer.</td>
+In this example, if https://contoso.com/travel is encountered in a redirect chain in Microsoft Edge, it will be opened in Internet Explorer.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 <tr>
@@ -210,14 +210,14 @@ In this example, if http://contoso.com/travel is encountered in a redirect chain
 <td>url</td>
 <td>Specifies the URL (and port number using standard port conventions) to which the child elements apply. The URL can be a domain, sub-domain, or any path URL.
 <br><b>Note</b><br>
-Make sure that you don't specify a protocol. Using &lt;site url="contoso.com"&gt; applies to both http://contoso.com and https://contoso.com.
+Make sure that you don't specify a protocol. Using &lt;site url="contoso.com"&gt; applies to both https://contoso.com and https://contoso.com.
 <p><b>Example</b>
 <pre class="syntax">
 &lt;site url="contoso.com:8080"&gt;
   &lt;compat-mode&gt;IE8Enterprise&lt;/compat-mode&gt;
   &lt;open-in&gt;IE11&lt;/open-in&gt;
 &lt;/site&gt;</pre>
-In this example, going to http://contoso.com:8080 using Microsoft Edge, causes the site to open in IE11 and load in IE8 Enterprise Mode.</td>
+In this example, going to https://contoso.com:8080 using Microsoft Edge, causes the site to open in IE11 and load in IE8 Enterprise Mode.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 </table>
@@ -286,7 +286,7 @@ Saving your v.1 version of the file using the new Enterprise Mode Site List Mana
 ### What not to include in your schema
 We recommend that you not add any of the following items to your schema because they can make your compatibility list behave in unexpected ways:
 
-- Don’t use protocols. For example, http://, https://, or custom protocols. They break parsing.
+- Don’t use protocols. For example, https://, https://, or custom protocols. They break parsing.
 - Don’t use wildcards.
 - Don’t use query strings, ampersands break parsing.
 

browsers/enterprise-mode/set-up-enterprise-mode-logging-and-data-collection.md

@@ -111,7 +111,7 @@ The required packages are automatically downloaded and included in the solution.
 
 1.  Open a registry editor on the computer where you deployed the app, go to the `HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Internet Explorer\Main\EnterpriseMode` key, and change the **Enable** string to:
 
-    ``` "Enable"="http://<deploy_URL>/api/records/"
+    ``` "Enable"="https://<deploy_URL>/api/records/"
     ```
  Where `<deploy_URL>` points to your deployment URL.
 
@@ -125,7 +125,7 @@ The required packages are automatically downloaded and included in the solution.
 
  **To view the report results**
 
--   Go to `http://<deploy_URL>/List` to see the report results.<p>
+-   Go to `https://<deploy_URL>/List` to see the report results.<p>
 If you’re already on the webpage, you’ll need to refresh the page to see the results.
 
     ![Enterprise Mode Result report with details](images/ie-emie-reportwdetails.png)

browsers/enterprise-mode/set-up-enterprise-mode-portal.md

@@ -176,7 +176,7 @@ Using the IIS Manager, you must restart both your Application Pool and your webs
 After you've created your database and website, you'll need to register yourself (or another employee) as an administrator for the Enterprise Mode Site List Portal.
 
 **To register as an administrator**
-1. Open Microsoft Edge and type your website URL into the Address bar. For example, http://emieportal:8085.
+1. Open Microsoft Edge and type your website URL into the Address bar. For example, https://emieportal:8085.
 
 2. Click **Register now**.
 
@@ -184,7 +184,7 @@ After you've created your database and website, you'll need to register yourself
 
 4. Click **Administrator** from the **Role** box, and then click **Save**.
 
-5. Append your website URL with `/#/EMIEAdminConsole` in the Address bar to go to your administrator console. For example, http://emieportal:8085/#/EMIEAdminConsole.
+5. Append your website URL with `/#/EMIEAdminConsole` in the Address bar to go to your administrator console. For example, https://emieportal:8085/#/EMIEAdminConsole.
 
    A dialog box appears, prompting you for the system user name and password. The default user name is EMIEAdmin and the default password is Admin123. We strongly recommend that you change the password by using the **Change password** link as soon as you're done with your first visit.
 

browsers/enterprise-mode/turn-on-enterprise-mode-and-use-a-site-list.md

@@ -33,7 +33,7 @@ All of your managed devices must have access to this location if you want them t
     -   **Local file:**   `"SiteList"="file:///c:\\Users\\<user>\\Documents\\testList.xml"`
 
     >   **Example:**  
-    >>  _Web URL_ http://localhost:8080/EnterpriseMode.xml
+    >>  _Web URL_ https://localhost:8080/EnterpriseMode.xml
     >>
     >>   _Network Share_ \\NetworkShare.xml (Place this inside the group policy folder on Sysvol)
     >>

browsers/enterprise-mode/turn-on-local-control-and-logging-for-enterprise-mode.md

@@ -46,9 +46,9 @@ Besides turning on this feature, you also have the option to provide a URL for E
 
 Your **Value data** location can be any of the following types:
 
--   **URL location (like, http://www.emieposturl.com/api/records or http://localhost:13000)**. IE sends a POST message to the URL every time a change is made to Enterprise Mode from the **Tools** menu.<p>**Important**<br>
+-   **URL location (like, https://www.emieposturl.com/api/records or https://localhost:13000)**. IE sends a POST message to the URL every time a change is made to Enterprise Mode from the **Tools** menu.<p>**Important**<br>
-The `http://www.emieposturl.com/api/records` example will only work if you’ve downloaded the sample discussed in the [Set up Enterprise Mode logging and data collection](set-up-enterprise-mode-logging-and-data-collection.md) topic. If you don’t have the sample, you won’t have the web API.
+The `https://www.emieposturl.com/api/records` example will only work if you’ve downloaded the sample discussed in the [Set up Enterprise Mode logging and data collection](set-up-enterprise-mode-logging-and-data-collection.md) topic. If you don’t have the sample, you won’t have the web API.
--   **Local network location (like, http://*emieposturl*/)**. IE sends a POST message to your specified local network location every time a change is made to Enterprise Mode from the **Tools** menu.
+-   **Local network location (like, https://*emieposturl*/)**. IE sends a POST message to your specified local network location every time a change is made to Enterprise Mode from the **Tools** menu.
 -   **Empty string**. If you leave the **Value data** box blank; your employees will be able to turn Enterprise Mode on and off from the **Tools** menu, but you won’t collect any logging data.
 
 For information about how to collect the data provided when your employees turn Enterprise Mode on or off from the **Tools** menu, see [Set up Enterprise Mode logging and data collection](set-up-enterprise-mode-logging-and-data-collection.md).

browsers/internet-explorer/ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-1-enterprise-mode-tool.md

@@ -33,7 +33,7 @@ You can add individual sites to your compatibility list by using the Enterprise
 1.  In the Enterprise Mode Site List Manager (schema v.1), click **Add**.
 
 2.  Type the URL for the website that’s experiencing compatibility problems, like *&lt;domain&gt;.com* or *&lt;domain&gt;.com*/*&lt;path&gt;* into the **URL** box.<p>
-Don't include the `http://` or `https://` designation. The tool automatically tries both versions during validation.
+Don't include the `https://` or `https://` designation. The tool automatically tries both versions during validation.
 
 3.  Type any comments about the website into the **Notes about URL** box.<p>
 Administrators can only see comments while they’re in this tool.

browsers/internet-explorer/ie11-deploy-guide/add-single-sites-to-enterprise-mode-site-list-using-the-version-2-enterprise-mode-tool.md

@@ -33,7 +33,7 @@ You can add individual sites to your compatibility list by using the Enterprise
 1.  In the Enterprise Mode Site List Manager (schema v.2), click **Add**.
 
 2.  Type the URL for the website that’s experiencing compatibility problems, like *&lt;domain&gt;.com* or *&lt;domain&gt;.com*/*&lt;path&gt;* into the **URL** box.<p>
-Don't include the `http://` or `https://` designation. The tool automatically tries both versions during validation.
+Don't include the `https://` or `https://` designation. The tool automatically tries both versions during validation.
 
 3.  Type any comments about the website into the **Notes about URL** box.<p>
 Administrators can only see comments while they’re in this tool.

browsers/internet-explorer/ie11-deploy-guide/auto-configuration-settings-for-ie11.md

@@ -52,7 +52,7 @@ After adding the `FEATURE\AUTOCONFIG\BRANDING` registry key, you can change your
 
     -   **Automatic Configuration URL (.INS file) box:** Type the location of your automatic configuration script.
 
-    -   **Automatic proxy URL (.JS, .JVS, or .PAC file) box:** Type the location of your automatic proxy script.<p> **Important**<br>Internet Explorer 11 no longer supports using file server locations with your proxy configuration (.pac) files. To keep using your .pac files, you have to keep them on a web server and reference them using a URL, like `http://share/test.ins`.
+    -   **Automatic proxy URL (.JS, .JVS, or .PAC file) box:** Type the location of your automatic proxy script.<p> **Important**<br>Internet Explorer 11 no longer supports using file server locations with your proxy configuration (.pac) files. To keep using your .pac files, you have to keep them on a web server and reference them using a URL, like `https://share/test.ins`.
 
 If your branding changes aren't correctly deployed after running through this process, see [Auto configuration and auto proxy problems with Internet Explorer 11](auto-configuration-and-auto-proxy-problems-with-ie11.md).
 

browsers/internet-explorer/ie11-deploy-guide/auto-detect-settings-for-ie11.md

@@ -40,7 +40,7 @@ To use automatic detection, you have to set up your DHCP and DNS servers.<p>**No
 
 3.  In your DNS database file, create a host record named, **WPAD**. This record has the IP address of the web server storing your automatic configuration (.js, .jvs, .pac, or .ins) file.<p>**-OR-**<p>Create a canonical name (CNAME) alias record named, **WPAD**. This record has the resolved name (not the IP address) of the server storing your automatic configuration (.pac) file.<p>**Note**<br>For more information about creating a **WPAD** entry, see [Creating a WPAD entry in DNS](https://go.microsoft.com/fwlink/p/?LinkId=294651). 
 
-4.  After the database file propagates to the server, the DNS name, `wpad.<domain>.com` resolves to the server name that includes your automatic configuration file.<p>**Note**<br>Internet Explorer 11 creates a default URL template based on the host name, **wpad**. For example, `http://wpad.<domain>.com/wpad.dat`. Because of this, you need to set up a file or redirection point in your web server **WPAD** record, named **wpad.dat**. The **wpad.dat** record delivers the contents of your automatic configuration file.
+4.  After the database file propagates to the server, the DNS name, `wpad.<domain>.com` resolves to the server name that includes your automatic configuration file.<p>**Note**<br>Internet Explorer 11 creates a default URL template based on the host name, **wpad**. For example, `https://wpad.<domain>.com/wpad.dat`. Because of this, you need to set up a file or redirection point in your web server **WPAD** record, named **wpad.dat**. The **wpad.dat** record delivers the contents of your automatic configuration file.
 
      
 

browsers/internet-explorer/ie11-deploy-guide/auto-proxy-configuration-settings-for-ie11.md

@@ -30,7 +30,7 @@ You can use your Internet settings (.ins) files to set up your standard proxy se
 
     -   **Automatic Configuration URL (.INS file) box:** Type the location of the .ins file you want to use for automatic configuration. For more information about setting up **Automatic Configuration**, see [Auto configuration settings for Internet Explorer 11](auto-configuration-settings-for-ie11.md).
 
-    -   **Automatic proxy URL (.JS, .JVS, or .PAC file) box:** Type the location of your automatic proxy script. This script runs whenever IE11 makes a network request and can include multiple proxy servers for each protocol type.<p>**Important**<br>IE11 no longer supports using file server locations with your proxy configuration (.pac) files. To keep using your .pac files, you have to keep them on a web server and reference them using a URL, like `http://share/test.ins`.
+    -   **Automatic proxy URL (.JS, .JVS, or .PAC file) box:** Type the location of your automatic proxy script. This script runs whenever IE11 makes a network request and can include multiple proxy servers for each protocol type.<p>**Important**<br>IE11 no longer supports using file server locations with your proxy configuration (.pac) files. To keep using your .pac files, you have to keep them on a web server and reference them using a URL, like `https://share/test.ins`.
 
 ## Locking your auto-proxy settings
 You have two options to restrict your users' ability to override the automatic configuration settings, based on your environment.

browsers/internet-explorer/ie11-deploy-guide/create-change-request-enterprise-mode-portal.md

@@ -50,7 +50,7 @@ Employees assigned to the Requester role can create a change request. A change r
 
     - **Business impact (optional).** An optional area where you can provide info about the business impact of this app and the change.
 
-    - **App location (URL).** The full URL location to the app, starting with http:// or https://.
+    - **App location (URL).** The full URL location to the app, starting with https:// or https://.
 
     - **App best viewed in.** Select the best browser experience for the app. This can be Internet Explorer 5 through Internet Explorer 11 or one of the IE7Enterprise or IE8Enterprise modes.
 

browsers/internet-explorer/ie11-deploy-guide/deploy-pinned-sites-using-mdt-2013.md

@@ -41,7 +41,7 @@ Deploying pinned websites in MDT 2013 is a 4-step process:
 Pinned websites are immediately available to every user who logs on to the computer although the user must click each icon to populate its Jump List.
 
 **Important**<br>
-To follow the examples in this topic, you’ll need to pin the Bing (http://www.bing.com/) and MSN (http://www.msn.com/) websites to the taskbar.
+To follow the examples in this topic, you’ll need to pin the Bing (https://www.bing.com/) and MSN (https://www.msn.com/) websites to the taskbar.
 
 ### Step 1: Creating .website files
 The first step is to create a .website file for each website that you want to pin to the Windows 8.1 taskbar during deployment. A .website file is like a shortcut, except it’s a plain text file that describes not only the website’s URL but also how the icon looks.

browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md

@@ -28,7 +28,7 @@ If you don't want to use the Enterprise Mode Site List Manager, you also have th
 The following is an example of the Enterprise Mode schema v.1. This schema can run on devices running Windows 7 and Windows 8.1.
 
 **Important**<br>
-Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<domain>contoso.com</domain>` automatically applies to both http://contoso.com and https://contoso.com.
+Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<domain>contoso.com</domain>` automatically applies to both https://contoso.com and https://contoso.com.
 
 ``` xml
 <rules version="1">
@@ -135,7 +135,7 @@ This table includes the elements used by the Enterprise Mode schema.
     &lt;path exclude="false"&gt;/products&lt;/path&gt;
   &lt;/domain&gt;
 &lt;/emie&gt;</pre><p>
-Where http://fabrikam.com doesn't use IE8 Enterprise Mode, but http://fabrikam.com/products does.</td>
+Where https://fabrikam.com doesn't use IE8 Enterprise Mode, but https://fabrikam.com/products does.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 </table>
@@ -167,7 +167,7 @@ This table includes the attributes used by the Enterprise Mode schema.
     &lt;path exclude="true"&gt;/products&lt;/path&gt;
   &lt;/domain&gt;
 &lt;/emie&gt;</pre><p>
-Where http://fabrikam.com uses IE8 Enterprise Mode, but http://fabrikam.com/products does not.</td>
+Where https://fabrikam.com uses IE8 Enterprise Mode, but https://fabrikam.com/products does not.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 <tr>
@@ -203,7 +203,7 @@ For example, say you want all of the sites in the contoso.com domain to open usi
 
 ### What not to include in your schema
 We recommend that you not add any of the following items to your schema because they can make your compatibility list behave in unexpected ways:
-- Don’t use protocols. For example, `http://`, `https://`, or custom protocols. They break parsing.
+- Don’t use protocols. For example, `https://`, `https://`, or custom protocols. They break parsing.
 - Don’t use wildcards.
 - Don’t use query strings, ampersands break parsing.
 

browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md

@@ -38,7 +38,7 @@ You can continue to use the v.1 version of the schema on Windows 10, but you wo
 The following is an example of the v.2 version of the Enterprise Mode schema.
 
 **Important**<br>
-Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<url="contoso.com">`, automatically applies to both http://contoso.com and https://contoso.com.
+Make sure that you don't specify a protocol when adding your URLs. Using a URL like `<url="contoso.com">`, automatically applies to both https://contoso.com and https://contoso.com.
  
 ``` xml
 <site-list version="205">
@@ -198,7 +198,7 @@ The &lt;url&gt; attribute, as part of the &lt;site&gt; element in the v.2 versio
 &lt;site url="contoso.com/travel"&gt;
   &lt;open-in allow-redirect="true"&gt;IE11&lt;/open-in&gt;
 &lt;/site&gt;</pre>
-In this example, if http://contoso.com/travel is encountered in a redirect chain in Microsoft Edge, it will be opened in Internet Explorer.</td>
+In this example, if https://contoso.com/travel is encountered in a redirect chain in Microsoft Edge, it will be opened in Internet Explorer.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 <tr>
@@ -210,14 +210,14 @@ In this example, if http://contoso.com/travel is encountered in a redirect chain
 <td>url</td>
 <td>Specifies the URL (and port number using standard port conventions) to which the child elements apply. The URL can be a domain, sub-domain, or any path URL.
 <br><b>Note</b><br>
-Make sure that you don't specify a protocol. Using &lt;site url="contoso.com"&gt; applies to both http://contoso.com and https://contoso.com.
+Make sure that you don't specify a protocol. Using &lt;site url="contoso.com"&gt; applies to both https://contoso.com and https://contoso.com.
 <p><b>Example</b>
 <pre class="syntax">
 &lt;site url="contoso.com:8080"&gt;
   &lt;compat-mode&gt;IE8Enterprise&lt;/compat-mode&gt;
   &lt;open-in&gt;IE11&lt;/open-in&gt;
 &lt;/site&gt;</pre>
-In this example, going to http://contoso.com:8080 using Microsoft Edge, causes the site to open in IE11 and load in IE8 Enterprise Mode.</td>
+In this example, going to https://contoso.com:8080 using Microsoft Edge, causes the site to open in IE11 and load in IE8 Enterprise Mode.</td>
 <td>Internet Explorer 11 and Microsoft Edge</td>
 </tr>
 </table>
@@ -286,7 +286,7 @@ Saving your v.1 version of the file using the new Enterprise Mode Site List Mana
 ### What not to include in your schema
 We recommend that you not add any of the following items to your schema because they can make your compatibility list behave in unexpected ways:
 
-- Don’t use protocols. For example, http://, https://, or custom protocols. They break parsing.
+- Don’t use protocols. For example, https://, https://, or custom protocols. They break parsing.
 - Don’t use wildcards.
 - Don’t use query strings, ampersands break parsing.
 

browsers/internet-explorer/ie11-deploy-guide/install-ie11-using-windows-server-update-services-wsus.md

@@ -16,7 +16,7 @@ Windows Server Update Services (WSUS) lets you download a single copy of the Mic
 
  **To import from Windows Update to WSUS**
 
-1.  Open your WSUS admin site. For example, `http://<wsus_server-name>/WSUSAdmin/`.<P>
+1.  Open your WSUS admin site. For example, `https://<wsus_server-name>/WSUSAdmin/`.<P>
 Where `<wsus_server_name>` is the name of your WSUS server.
 
 2.  Choose the top server node or the **Updates** node, and then click **Import Updates**.

browsers/internet-explorer/ie11-deploy-guide/intranet-problems-and-ie11.md

@@ -21,7 +21,7 @@ IE11 works differently with search, based on whether your organization is domain
 
 -   **Non-domain-joined computers.** A single word entry is treated as an intranet site. However, if the term doesn't resolve to a site, IE11 then treats the entry as a search term and opens your default search provider.
 
-To explicitly go to an intranet site, regardless of the environment, users can type either a trailing slash like ` contoso/` or the `http://` prefix. Either of these will cause IE11 to treat the entry as an intranet search. You can also change the default behavior so that IE11 treats your single word entry in the address bar as an intranet site, regardless of your environment.
+To explicitly go to an intranet site, regardless of the environment, users can type either a trailing slash like ` contoso/` or the `https://` prefix. Either of these will cause IE11 to treat the entry as an intranet search. You can also change the default behavior so that IE11 treats your single word entry in the address bar as an intranet site, regardless of your environment.
 
  **To enable single-word intranet search**
 
@@ -29,7 +29,7 @@ To explicitly go to an intranet site, regardless of the environment, users can t
 
 2.  Click **Advanced**, check the **Go to an intranet site for a single word entry in the Address bar** box, and then click **OK**.
 
-If you'd like your entire organization to have single word entries default to an intranet site, you can turn on the **Go to an intranet site for a single word entry in the Address bar** Group Policy. With this policy turned on, a search for `contoso` automatically resolves to `http://contoso`.
+If you'd like your entire organization to have single word entries default to an intranet site, you can turn on the **Go to an intranet site for a single word entry in the Address bar** Group Policy. With this policy turned on, a search for `contoso` automatically resolves to `https://contoso`.
 
  
 

browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md

@@ -115,7 +115,7 @@ Out-of-date ActiveX control blocking is turned off in the Local Intranet Zone an
 |--------|--------------|-------------|----------|
 |Turn on ActiveX control logging in IE |`Administrative Templates\Windows Components\Internet Explorer\Security Features\Add-on Management` |Internet Explorer 8 through IE11 |This setting determines whether IE saves log information for ActiveX controls.<p>If you enable this setting, IE logs ActiveX control information (including the source URI that loaded the control and whether it was blocked) to a local file.<p>If you disable or don't configure this setting, IE won't log ActiveX control information.<p>Note that you can turn this setting on or off regardless of the **Turn off blocking of outdated ActiveX controls for IE** or **Turn off blocking of outdated ActiveX controls for IE on specific domains** settings. |
 |Remove the **Run this time** button for outdated ActiveX controls in IE |`Administrative Templates\Windows Components\Internet Explorer\Security Features\Add-on Management`|Internet Explorer 8 through IE11 |This setting allows you stop users from seeing the **Run this time** button and from running specific outdated ActiveX controls in IE.<p>If you enable this setting, users won't see the **Run this time** button on the warning message that appears when IE blocks an outdated ActiveX control.<p>If you disable or don't configure this setting, users will see the **Run this time** button on the warning message that appears when IE blocks an outdated ActiveX control. Clicking this button lets the user run the outdated ActiveX control once. |
-|Turn off blocking of outdated ActiveX controls for IE on specific domains |`Administrative Templates\Windows Components\Internet Explorer\Security Features\Add-on Management` |Internet Explorer 8 through IE11 |This setting allows you to manage a list of domains on which IE will stop blocking outdated ActiveX controls. Outdated ActiveX controls are never blocked in the Intranet Zone.<p>If you enable this setting, you can enter a custom list of domains for which outdated ActiveX controls won't be blocked in IE. Each domain entry must be formatted like one of the following:<ul><li>**"domainname.TLD".** For example, if you want to include `*.contoso.com/*`, use "contoso.com".</li><li>**"hostname".** For example, if you want to include `http://example`, use "example".</li><li>**"file:///path/filename.htm"**. For example, use `file:///C:/Users/contoso/Desktop/index.htm`.</li></ul><p>If you disable or don't configure this setting, the list is deleted and IE continues to block specific outdated ActiveX controls on all domains in the Internet Zone. |
+|Turn off blocking of outdated ActiveX controls for IE on specific domains |`Administrative Templates\Windows Components\Internet Explorer\Security Features\Add-on Management` |Internet Explorer 8 through IE11 |This setting allows you to manage a list of domains on which IE will stop blocking outdated ActiveX controls. Outdated ActiveX controls are never blocked in the Intranet Zone.<p>If you enable this setting, you can enter a custom list of domains for which outdated ActiveX controls won't be blocked in IE. Each domain entry must be formatted like one of the following:<ul><li>**"domainname.TLD".** For example, if you want to include `*.contoso.com/*`, use "contoso.com".</li><li>**"hostname".** For example, if you want to include `https://example`, use "example".</li><li>**"file:///path/filename.htm"**. For example, use `file:///C:/Users/contoso/Desktop/index.htm`.</li></ul><p>If you disable or don't configure this setting, the list is deleted and IE continues to block specific outdated ActiveX controls on all domains in the Internet Zone. |
 |Turn off blocking of outdated ActiveX controls for IE |`Administrative Templates\Windows Components\Internet Explorer\Security Features\Add-on Management` |Internet Explorer 8 through IE11 |This setting determines whether IE blocks specific outdated ActiveX controls. Outdated ActiveX controls are never blocked in the Intranet Zone.<p>If you enable this setting, IE stops blocking outdated ActiveX controls.<p>If you disable or don't configure this setting, IE continues to block specific outdated ActiveX controls. |
 |Remove the **Update** button in the out-of-date ActiveX control blocking notification for IE |This functionality is only available through the registry |Internet Explorer 8 through IE11 |This setting determines whether the out-of-date ActiveX control blocking notification shows the **Update** button. This button points users to update specific out-of-date ActiveX controls in IE. |
 
@@ -145,8 +145,8 @@ Here’s a detailed example and description of what’s included in the VersionA
 
 |Source URI |File path |Product version |File version |Allowed/Blocked |Reason |EPM-compatible |
 |-----------|----------|----------------|-------------|----------------|-------|---------------|
-|`http://contoso.com/test1.html` |C:\Windows\System32\Macromed\Flash\Flash.ocx |14.0.0.125 |14.0.0.125 |Allowed |Not in blocklist |EPM-compatible |
+|`https://contoso.com/test1.html` |C:\Windows\System32\Macromed\Flash\Flash.ocx |14.0.0.125 |14.0.0.125 |Allowed |Not in blocklist |EPM-compatible |
-|`http://contoso.com/test2.html` |C:\Program Files\Java\jre6\bin\jp2iexp.dll |6.0.410.2 |6.0.410.2 |Blocked |Out of date |Not EPM-compatible |
+|`https://contoso.com/test2.html` |C:\Program Files\Java\jre6\bin\jp2iexp.dll |6.0.410.2 |6.0.410.2 |Blocked |Out of date |Not EPM-compatible |
 
 **Where:**
 -   **Source URI.** The URL of the page that loaded the ActiveX control.

browsers/internet-explorer/ie11-deploy-guide/set-up-enterprise-mode-logging-and-data-collection.md

@@ -111,7 +111,7 @@ The required packages are automatically downloaded and included in the solution.
 
 1.  Open a registry editor on the computer where you deployed the app, go to the `HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Internet Explorer\Main\EnterpriseMode` key, and change the **Enable** string to:
 
-    ``` "Enable"="http://<deploy_URL>/api/records/"
+    ``` "Enable"="https://<deploy_URL>/api/records/"
     ```
  Where `<deploy_URL>` points to your deployment URL.
 
@@ -125,7 +125,7 @@ The required packages are automatically downloaded and included in the solution.
 
  **To view the report results**
 
--   Go to `http://<deploy_URL>/List` to see the report results.<p>
+-   Go to `https://<deploy_URL>/List` to see the report results.<p>
 If you’re already on the webpage, you’ll need to refresh the page to see the results.
 
     ![Enterprise Mode Result report with details](images/ie-emie-reportwdetails.png)

browsers/internet-explorer/ie11-deploy-guide/set-up-enterprise-mode-portal.md

@@ -176,7 +176,7 @@ Using the IIS Manager, you must restart both your Application Pool and your webs
 After you've created your database and website, you'll need to register yourself (or another employee) as an administrator for the Enterprise Mode Site List Portal.
 
 **To register as an administrator**
-1. Open Microsoft Edge and type your website URL into the Address bar. For example, http://emieportal:8085.
+1. Open Microsoft Edge and type your website URL into the Address bar. For example, https://emieportal:8085.
 
 2. Click **Register now**.
 
@@ -184,7 +184,7 @@ After you've created your database and website, you'll need to register yourself
 
 4. Click **Administrator** from the **Role** box, and then click **Save**.
 
-5. Append your website URL with `/#/EMIEAdminConsole` in the Address bar to go to your administrator console. For example, http://emieportal:8085/#/EMIEAdminConsole.
+5. Append your website URL with `/#/EMIEAdminConsole` in the Address bar to go to your administrator console. For example, https://emieportal:8085/#/EMIEAdminConsole.
 
    A dialog box appears, prompting you for the system user name and password. The default user name is EMIEAdmin and the default password is Admin123. We strongly recommend that you change the password by using the **Change password** link as soon as you're done with your first visit.
 

browsers/internet-explorer/ie11-deploy-guide/turn-on-local-control-and-logging-for-enterprise-mode.md

@@ -46,9 +46,9 @@ Besides turning on this feature, you also have the option to provide a URL for E
 
 Your **Value data** location can be any of the following types:
 
--   **URL location (like, http://www.emieposturl.com/api/records or http://localhost:13000)**. IE sends a POST message to the URL every time a change is made to Enterprise Mode from the **Tools** menu.<p>**Important**<br>
+-   **URL location (like, https://www.emieposturl.com/api/records or https://localhost:13000)**. IE sends a POST message to the URL every time a change is made to Enterprise Mode from the **Tools** menu.<p>**Important**<br>
-The `http://www.emieposturl.com/api/records` example will only work if you’ve downloaded the sample discussed in the [Set up Enterprise Mode logging and data collection](set-up-enterprise-mode-logging-and-data-collection.md) topic. If you don’t have the sample, you won’t have the web API.
+The `https://www.emieposturl.com/api/records` example will only work if you’ve downloaded the sample discussed in the [Set up Enterprise Mode logging and data collection](set-up-enterprise-mode-logging-and-data-collection.md) topic. If you don’t have the sample, you won’t have the web API.
--   **Local network location (like, http://*emieposturl*/)**. IE sends a POST message to your specified local network location every time a change is made to Enterprise Mode from the **Tools** menu.
+-   **Local network location (like, https://*emieposturl*/)**. IE sends a POST message to your specified local network location every time a change is made to Enterprise Mode from the **Tools** menu.
 -   **Empty string**. If you leave the **Value data** box blank; your employees will be able to turn Enterprise Mode on and off from the **Tools** menu, but you won’t collect any logging data.
 
 For information about how to collect the data provided when your employees turn Enterprise Mode on or off from the **Tools** menu, see [Set up Enterprise Mode logging and data collection](set-up-enterprise-mode-logging-and-data-collection.md).

browsers/internet-explorer/ie11-ieak/auto-config-ieak11-wizard.md

@@ -42,7 +42,7 @@ You can use the Domain Name System (DNS) and the Dynamic Host Configuration Prot
     -   Type the location to your automatic proxy script file.
 
         **Note**<br>
-        If you specify URLs for both auto-config and auto-proxy, the auto-proxy URL will be incorporated into the .ins file. The correct form for the URL is `http://share/test.ins`.
+        If you specify URLs for both auto-config and auto-proxy, the auto-proxy URL will be incorporated into the .ins file. The correct form for the URL is `https://share/test.ins`.
 
 3.  Click **Next** to go to the [Proxy Settings](proxy-settings-ieak11-wizard.md) page or **Back** to go to the [Connection Settings](connection-settings-ieak11-wizard.md) page.
 

browsers/internet-explorer/ie11-ieak/auto-detection-dhcp-or-dns-servers-ieak11.md

@@ -36,9 +36,9 @@ DHCP has a higher priority than DNS for automatic configuration. If DHCP provide
 -   Open the [DHCP Administrative Tool](https://go.microsoft.com/fwlink/p/?LinkId=302212), create a new option type, using the code number 252, and then associate it with the URL to your configuration file. For detailed instructions about how to do this, see [Create an option 252 entry in DHCP](https://go.microsoft.com/fwlink/p/?LinkId=294649).
 
     **Examples:**<br>
-    `http://www.microsoft.com/webproxy.pac`<br>
+    `https://www.microsoft.com/webproxy.pac`<br>
-    `http://marketing/config.ins`<br>
+    `https://marketing/config.ins`<br>
-    `http://123.4.567.8/account.pac`<p>
+    `https://123.4.567.8/account.pac`<p>
     For more detailed info about how to set up your DHCP server, see your server documentation.
 
 **To set up automatic detection for DNS servers**
@@ -55,5 +55,5 @@ Create a canonical name (CNAME) alias record, named **WPAD**. This record lets y
 2.  After the database file propagates to the server, the DNS name, `wpad.<domain>.com` resolves to the server name that includes your automatic configuration file.
 
 **Note**<br>
-IE11 creates a default URL template based on the host name,**wpad**. For example, `http://wpad.<domain>.com/wpad.dat`. Because of this, you need to set up a file or redirection point in your web server **WPAD** record, named **wpad.dat**. The **wpad.dat** record delivers the contents of your automatic configuration file.
+IE11 creates a default URL template based on the host name,**wpad**. For example, `https://wpad.<domain>.com/wpad.dat`. Because of this, you need to set up a file or redirection point in your web server **WPAD** record, named **wpad.dat**. The **wpad.dat** record delivers the contents of your automatic configuration file.
 

browsers/internet-explorer/ie11-ieak/custombranding-ins-file-setting.md

@@ -16,5 +16,5 @@ Provide the URL to your branding cabinet (.cab) file.
 
 |Name       |Value                           | Description                                                  |
 |-----------|--------------------------------|--------------------------------------------------------------|
-|Branding |`<cab_file_url>` |The location of your branding cabinet (.cab) file. For example, http://www.&lt;your_server&gt;.net/cabs/branding.cab.|
+|Branding |`<cab_file_url>` |The location of your branding cabinet (.cab) file. For example, https://www.&lt;your_server&gt;.net/cabs/branding.cab.|
 

browsers/internet-explorer/ie11-ieak/customize-automatic-search-for-ie.md

@@ -21,7 +21,7 @@ You can customize Automatic Search so that your employees can type a single word
 
 **To set up Automatic Search**
 
-1.  Create a script (.asp) file that conditionally looks for search terms, and post it to an intranet server here: http://ieautosearch/response.asp?MT=%1&srch=%2.<p>
+1.  Create a script (.asp) file that conditionally looks for search terms, and post it to an intranet server here: https://ieautosearch/response.asp?MT=%1&srch=%2.<p>
 For info about the acceptable values for the *%1* and *%2* parameters, see the [Automatic Search parameters](#automatic-search-parameters). For an example of the script file, see the [Sample Automatic Search script](#sample-automatic-search-script).<p>
 **Important**<br>If you aren’t using IIS in your company, you’ll need to remap this URL to your script file’s location. 
 
@@ -72,18 +72,18 @@ searchOption = Request.QueryString("srch")
 ' about filling out an expense report
 
 if (search = "NEW HIRE") then
-Response.Redirect("http://admin/hr/newhireforms.htm") 
+Response.Redirect("https://admin/hr/newhireforms.htm") 
 elseif (search = "LIBRARY CATALOG") then
-Response.Redirect("http://library/catalog")
+Response.Redirect("https://library/catalog")
 elseif (search = "EXPENSE REPORT") then
-Response.Redirect("http://expense")
+Response.Redirect("https://expense")
 elseif (search = "LUNCH MENU") then
-Response.Redirect("http://cafe/menu/")
+Response.Redirect("https://cafe/menu/")
 else
 
 ' If there is not a match, use the
 ' default IE autosearch server
-Response.Redirect("http://auto.search.msn.com/response.asp?MT="
+Response.Redirect("https://auto.search.msn.com/response.asp?MT="
 + search + "&srch=" + searchOption + 
 "&prov=&utf8")
 end if

browsers/internet-explorer/ie11-ieak/important-urls-home-page-and-support-ieak11-wizard.md

@@ -17,7 +17,7 @@ The **Important URLS – Home Page and Support** page of the Internet Explorer C
 **To use the Important URLS – Home Page and Support page**
 
 1.  In the **Add a homepage URL** box, type the URL to the page your employees go to when they click the **Home** button, and then click **Add**.<p>
-If you add multiple **Home** pages, each page appears on a separate tab in the browser. If you don’t add a custom **Home** page, IE uses http://www.msn.com by default. If you want to delete an existing page, click the URL and then click **Remove**.
+If you add multiple **Home** pages, each page appears on a separate tab in the browser. If you don’t add a custom **Home** page, IE uses https://www.msn.com by default. If you want to delete an existing page, click the URL and then click **Remove**.
 
 2.  Check the **Retain previous Home Page (Upgrade)** box if you have employees with previous versions of IE, who need to keep their **Home** page settings when the browser is updated.
 

browsers/internet-explorer/ie11-ieak/proxy-auto-config-examples.md

@@ -127,7 +127,7 @@ In this example, the proxy server is selected by translating the host name into
 ``` javascript
 function FindProxyForURL(url, host)
  {
- if (dnsResolve(host) == "999.99.99.999") { // = http://secproxy
+ if (dnsResolve(host) == "999.99.99.999") { // = https://secproxy
  return "PROXY secproxy:8080";
  }
  else {

browsers/internet-explorer/ie11-ieak/proxy-settings-ieak11-wizard.md

@@ -21,7 +21,7 @@ Using a proxy server lets you limit access to the Internet. You can also use the
 1.  Check the **Enable proxy settings** box if you want to use proxy servers for any of your services.
 
 2.  Type the address of the proxy server you want to use for your services into the **Address of proxy** box. In most cases, a single proxy server is used for all of your services.<p>
-Proxy locations that don’t begin with a protocol (like, http:// or ftp://) are assumed to be a CERN-type HTTP proxy. For example, the entry *proxy* is treated the same as the entry `http://proxy`.
+Proxy locations that don’t begin with a protocol (like, https:// or ftp://) are assumed to be a CERN-type HTTP proxy. For example, the entry *proxy* is treated the same as the entry `https://proxy`.
 
 3.  Type the port for each service. The default value is *80*.
 
@@ -30,7 +30,7 @@ Proxy locations that don’t begin with a protocol (like, http:// or ftp://) are
 5.  Type any services that shouldn’t use a proxy server into the **Do not use proxy server for addresses beginning with** box.<p>
 When filling out your exceptions, keep in mind:
 
-    -   Proxy bypass entries can begin with a protocol type, such as http://, https://, or ftp://. However, if a protocol type is used, the exception entry applies only to requests for that protocol.
+    -   Proxy bypass entries can begin with a protocol type, such as https://, https://, or ftp://. However, if a protocol type is used, the exception entry applies only to requests for that protocol.
 
     -   Protocol values are not case sensitive and you can use a wildcard character (*) in place of zero or more characters.
 

browsers/internet-explorer/ie11-ieak/search-providers-ieak11-wizard.md

@@ -25,7 +25,7 @@ The **Search Provider** box appears.
 
 3.  In the **Display Name** box, type the text that appears in the **Search Options** menu for the search provider.
 
-4.  In the **URL** box, type the full URL to the search provider, including the http:// prefix.
+4.  In the **URL** box, type the full URL to the search provider, including the https:// prefix.
 
 5.  In the **Favicon URL** box, type the full URL to any icon to associate with your provider.
 

browsers/internet-explorer/ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md

@@ -57,7 +57,7 @@ Internet Explorer Setup can switch servers during the installation process to ma
 To address connection issues (for example, as a result of server problems) where Setup can’t locate another download site by default, we recommend you overwrite your first download server using this workaround:
 
 ``` syntax
-<path>\ie11setup.exe /C:"ie11wzd.exe /S:""<path>\ie11setup.exe"" /L:""http://your_Web_server/your_Web_site/ie11sites.dat"""
+<path>\ie11setup.exe /C:"ie11wzd.exe /S:""<path>\ie11setup.exe"" /L:""https://your_Web_server/your_Web_site/ie11sites.dat"""
 ```
 
 Where `<path>` represents the folder location where you stored IE11setup.exe.

devices/hololens/TOC.md

@@ -11,4 +11,5 @@
 ## [Configure HoloLens using a provisioning package](hololens-provisioning.md)
 ## [Install apps on HoloLens](hololens-install-apps.md)
 ## [Enable Bitlocker device encryption for HoloLens](hololens-encryption.md)
+## [How HoloLens stores data for spaces](hololens-spaces.md)
 ## [Change history for Microsoft HoloLens documentation](change-history-hololens.md)

devices/hololens/change-history-hololens.md

@@ -9,13 +9,20 @@ author: jdeckerms
 ms.author: jdecker
 ms.topic: article
 ms.localizationpriority: medium
-ms.date: 10/23/2018
+ms.date: 11/05/2018
 ---
 
 # Change history for Microsoft HoloLens documentation
 
 This topic lists new and updated topics in the [Microsoft HoloLens documentation](index.md).
 
+## November 2018
+
+New or changed topic | Description
+--- | ---
+[How HoloLens stores data for spaces](hololens-spaces.md) | New
+
+
 ## October 2018
 
 New or changed topic | Description
@@ -25,6 +32,7 @@ New or changed topic | Description
 [Microsoft Dynamics 365 Layout app](hololens-microsoft-dynamics-365-layout-app.md) | Removed, and redirected to [Overview of Dynamics 365 Layout](https://docs.microsoft.com/dynamics365/mixed-reality/layout/)
 [Insider preview for Microsoft HoloLens](hololens-insider.md) | Added instructions for opting out of Insider builds.
 
+
 ## July 2018
 
 New or changed topic | Description

devices/hololens/hololens-kiosk.md

@@ -145,7 +145,8 @@ Use the following snippet in your kiosk configuration XML to enable the **Guest*
 
   ![Screenshot of the MultiAppAssignedAccessSettings field in Windows Configuration Designer](images/multiappassignedaccesssettings.png)
 
-
+8. (**Optional**: If you want to apply the provisioning package after device initial setup and there is an admin user already available on the kiosk device, skip this step.) Create an admin user account in **Runtime settings** > **Accounts** > **Users**. Provide a **UserName** and **Password**, and select **UserGroup** as **Administrators**. With this account, you can view the provisioning status and logs if needed.   
+8. (**Optional**: If you already have a non-admin account on the kiosk device, skip this step.) Create a local standard user account in **Runtime settings** > **Accounts** > **Users**. Make sure the **UserName** is the same as the account that you specify in the configuration XML. Select **UserGroup** as **Standard Users**.
 8.  On the **File** menu, select **Save.**
 9.  On the **Export** menu, select **Provisioning package**.
 10. Change **Owner** to **IT Admin**, which will set the precedence of this provisioning package higher than provisioning packages applied to this device from other sources, and then select **Next.**

devices/hololens/hololens-spaces.md

@@ -0,0 +1,69 @@
+---
+title: How HoloLens stores data for spaces (HoloLens)
+description: 
+ms.prod: hololens
+ms.sitesec: library
+author: jdeckerms
+ms.author: jdecker
+ms.topic: article
+ms.localizationpriority: medium
+ms.date: 11/05/2018
+---
+
+# How HoloLens stores data for spaces
+
+In the Windows 10, version 1803 update for Microsoft HoloLens, the mapping data for [spaces](https://support.microsoft.com/help/13760/hololens-spaces-on-hololens) is stored in a local database. 
+
+The map database is not exposed to a user of the device, even when plugged into a PC or when using the File Explorer app. When BitLocker is enabled, the stored map data is also encrypted with the entire volume.
+
+Holograms that are anchored within the same map section are considered to be “nearby” in the current space.
+
+
+## Frequently asked questions
+
+**How can I remove map data and known spaces from the HoloLens?**
+
+There are two options for deleting map data in **Settings > System > Holograms**: 
+
+- Select **Remove nearby holograms** to delete nearby holograms, clearing the map data and anchored holograms for the current space. A brand new map section would be created and stored in the database for that location while the device is used there. This option can be used to clear the map data for work without affecting any map data from home, for example.
+- Select **Remove all holograms** to delete all holograms, clearing all locally stored map data and anchored holograms. No holograms will be rediscovered and any holograms need to be newly placed.
+
+>[!NOTE]
+>When you remove nearby or all holograms, HoloLens immediately starts scanning and mapping the current space.
+
+**How does Wi-Fi data get used by HoloLens and where is the data stored?**
+
+As long as Wi-Fi is enabled, map data will be correlated with nearby Wi-Fi access points. There is no difference in behavior if a network is connected or just nearby. Network characteristics are not sent to Microsoft, and all Wi-Fi references are kept local on the HoloLens.
+
+Wi-Fi characteristics are stored locally to help correlate hologram locations and map sections stored within HoloLens’ database of known spaces. It’s inaccessible to users, and not sent to Microsoft via the cloud or via telemetry.
+
+
+
+**Does HoloLens need to be connected to the internet?**
+
+No, internet connectivity is not required. Observed Wi-Fi access points are obtained without being connected or authenticated. It does not change functionality if the access points are internet connected or intranet/local only.
+
+
+
+
+
+**Since HoloLens no longer requires you to select a space when Wi-Fi is disabled, how does it find the space automatically?**
+
+If Wi-Fi is disabled, the space search can still happen; HoloLens will need to search more of the map data within the spaces database, and finding holograms can take longer. 
+
+HoloLens will sense and remember spaces even when Wi-Fi is disabled, by securely storing the sensor data when holograms are placed. Without the Wi-Fi info, the space and holograms may be slower to recognize at a later time, as the HoloLens needs to compare active scans to all hologram anchors and map sections stored on the device in order to locate the correct portion of the map.
+
+HoloLens will visually compare the current scanning data from the sensors to locally stored map sections in the entire spaces database.  It will locate holograms faster if the Wi-Fi characteristics can be found, to narrow down the number of spaces to compare.
+
+
+
+
+ 
+
+
+
+## Related topics
+
+- [Environment considerations for HoloLens](https://docs.microsoft.com/windows/mixed-reality/environment-considerations-for-hololens)
+- [Spatial mapping design](https://docs.microsoft.com/windows/mixed-reality/spatial-mapping-design)
+- [HoloLens and holograms: FAQ](https://support.microsoft.com/help/13456/hololens-and-holograms-faq)

mdop/appv-v5/how-to-deploy-the-app-v-client-gb18030.md

@@ -1,13 +1,14 @@
 ---
 title: How to Deploy the App-V Client
 description: How to Deploy the App-V Client
+ms.author: pashort
 author: jamiejdt
 ms.assetid: 9c4e67ae-ddaf-4e23-8c16-72d029a74a27
 ms.pagetype: mdop, appcompat, virtualization
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.prod: w10
-ms.date: 11/01/2016
+ms.date: 11/05/2018
 ---
 
 
@@ -30,93 +31,31 @@ Use the following procedure to install the Microsoft Application Virtualization
 
 2. Review the client coexistence and unsupported scenarios, as applicable to your installation:
 
-    <table>
+   | | |
-    <colgroup>
+   |---|---|
-    <col width="50%" />
+   |Deploying coexisting App-V clients |[Planning for the App-V 5.0 Sequencer and Client Deployment](planning-for-the-app-v-50-sequencer-and-client-deployment.md) |
-    <col width="50%" />
+   |Unsupported or limited installation scenarios |[App-V 5.0 Supported Configurations](app-v-50-supported-configurations.md) |
-    </colgroup>
+   ---
-    <tbody>
-    <tr class="odd">
-    <td align="left"><p>Deploying coexisting App-V clients</p></td>
-    <td align="left"><p>[Planning for the App-V 5.0 Sequencer and Client Deployment](planning-for-the-app-v-50-sequencer-and-client-deployment.md)</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>Unsupported or limited installation scenarios</p></td>
-    <td align="left"><p>See the client section in [App-V 5.0 Supported Configurations](app-v-50-supported-configurations.md)</p></td>
-    </tr>
-    </tbody>
-    </table>
-
    
-
 3. Review the locations for client registry, log, and troubleshooting information:
 
-<table>
+   | | |
-<colgroup>
+   |---|---|
-<col width="50%" />
+   |Client registry information |<ul><li>By default, after you install the App-V 5.0 client, the client information is stored in the registry in the following registry key:<p><p><code>HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\APPV\CLIENT</code></li><li>When you deploy a virtualized package to a computer that is running the App-V client, the associated package data is stored in the following location:<p><p><code>C:\ProgramData\App-V</code><p><p>However, you can reconfigure this location with the following registry key:<p><p><code>HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\SOFTWARE\MICROSOFT\APPV\CLIENT\STREAMING\PACKAGEINSTALLATIONROOT</code></li></ul> |
-<col width="50%" />
+   |Client log files |<ul><li>For log file information that is associated with the App-V 5.0 Client, search in the following log:<p><p><code>Event logs/Applications and Services Logs/Microsoft/AppV</code></li><li>In App-V 5.0 SP3, some logs have been consolidated and moved to the following location:<p><p><code>Event logs/Applications and Services Logs/Microsoft/AppV/ServiceLog</code><p><p>For a list of the moved logs, see [About App-V 5.0 SP3](about-app-v-50-sp3.md#bkmk-event-logs-moved).</li><li>Packages that are currently stored on computers that run the App-V 5.0 Client are saved to the following location:<p><p><code>C:\ProgramData\App-V\<_package id_>\<_version id_></code></li></ul> |
-</colgroup>
+   |Client installation troubleshooting information |See the error log in the **%temp%** folder. To review the log files, click **Start**, type **%temp%**, and then look for the **appv_ log**. |
-<tbody>
+   ---
-<tr class="odd">
-<td align="left"><p>Client registry information</p></td>
-<td align="left"><ul>
-<li><p>By default, after you install the App-V 5.0 client, the client information is stored in the registry in the following registry key:</p>
-<p><strong>HKEY_LOCAL_MACHINE \ SOFTWARE \ MICROSOFT \ APPV \ CLIENT</strong></p></li>
-<li><p>When you deploy a virtualized package to a computer that is running the App-V client, the associated package data is stored in the following location:</p>
-<p><strong>C: \ ProgramData \ App-V</strong></p>
-<p>However, you can reconfigure this location with the following registry key:</p>
-<p><strong>HKEY_LOCAL_MACHINE \ SOFTWARE \ MICROSOFT \ SOFTWARE \ MICROSOFT \ APPV \ CLIENT \ STREAMING \ PACKAGEINSTALLATIONROOT</strong></p></li>
-</ul></td>
-</tr>
-<tr class="even">
-<td align="left"><p>Client log files</p></td>
-<td align="left"><ul>
-<li><p>For log file information that is associated with the App-V 5.0 Client, search in the following log:</p>
-<p><strong>Event logs / Applications and Services Logs / Microsoft / AppV</strong></p></li>
-<li><p>In App-V 5.0 SP3, some logs have been consolidated and moved to the following location:</p>
-<p><strong>Event logs/Applications and Services Logs/Microsoft/AppV/ServiceLog</strong></p>
-<p>For a list of the moved logs, see [About App-V 5.0 SP3](about-app-v-50-sp3.md#bkmk-event-logs-moved).</p></li>
-<li><p>Packages that are currently stored on computers that run the App-V 5.0 Client are saved to the following location:</p>
-<p><strong>C:\ProgramData\App-V\&lt;package id&gt;\&lt;version id&gt;</strong></p></li>
-</ul></td>
-</tr>
-<tr class="odd">
-<td align="left"><p>Client installation troubleshooting information</p></td>
-<td align="left"><p>See the error log in the <strong>%temp%</strong> folder. To review the log files, click <strong>Start</strong>, type <strong>%temp%</strong>, and then look for the <strong>appv_ log</strong>.</p></td>
-</tr>
-</tbody>
-</table>
    
- 
 
 **To install the App-V 5.0 Client**
 
-1.  Copy the App-V 5.0 client installation file to the computer on which it will be installed. Choose from the following client types:
+1. Copy the App-V 5.0 client installation file to the computer on which it will be installed.<p><p>Choose from the following client types:
 
-    <table>
+   |Client type |File to use |
-    <colgroup>
+   |---|---|
-    <col width="50%" />
+   |Standard version of the client   |**appv_client_setup.exe**  |
-    <col width="50%" />
+   |Remote Desktop Services version of the client   |**appv_client_setup_rds.exe**   |
-    </colgroup>
+   ---
-    <thead>
-    <tr class="header">
-    <th align="left">Client type</th>
-    <th align="left">File to use</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr class="odd">
-    <td align="left"><p>Standard version of the client</p></td>
-    <td align="left"><p><strong>appv_client_setup.exe</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>Remote Desktop Services version of the client</p></td>
-    <td align="left"><p><strong>appv_client_setup_rds.exe</strong></p></td>
-    </tr>
-    </tbody>
-    </table>
-
-     
 
 2. Double-click the installation file, and click **Install**. Before the installation begins, the installer checks the computer for any missing [App-V 5.0 Prerequisites](app-v-50-prerequisites.md).
 
@@ -132,10 +71,9 @@ Use the following procedure to install the Microsoft Application Virtualization
 
    -   **language pack**
    
-        **Note**  
+   >[!NOTE]
-        After the installation, only the .exe file can be uninstalled.
+   >After the installation, only the .exe file can be uninstalled.
 
-         
 
 **To install the App-V 5.0 client using a script**
 
@@ -143,142 +81,42 @@ Use the following procedure to install the Microsoft Application Virtualization
 
 2. To use a script to install the App-V 5.0 client, use the following parameters with **appv\_client\_setup.exe**.
 
-    **Note**  
+   >[!NOTE]
-    The client Windows Installer (.msi) supports the same set of switches, except for the **/LOG** parameter.
+   >The client Windows Installer (.msi) supports the same set of switches, except for the **/LOG** parameter.
 
-     
+   | | |
-
+   |---|---|
-    <table>
+   |/INSTALLDIR |Specifies the installation directory. Example usage:<p><p>**/INSTALLDIR=C:\Program Files\AppV Client** |
-    <colgroup>
+   |/CEIPOPTIN |Enables participation in the Customer Experience Improvement Program. Example usage:<p><p>**/CEIPOPTIN=[0\|1\]** |
-    <col width="50%" />
+   |/MUOPTIN |Enables Microsoft Update. Example usage:<p><p>**/MUOPTIN=[0\|1\]** |
-    <col width="50%" />
+   |/PACKAGEINSTALLATIONROOT |Specifies the directory in which to install all new applications and updates. Example usage: <p><p>**/PACKAGEINSTALLATIONROOT='C:\App-V Packages'** |
-    </colgroup>
+   |/PACKAGESOURCEROOT |Overrides the source location for downloading package content. Example usage:<p><p>**/PACKAGESOURCEROOT='http://packageStore'** |
-    <tbody>
+   |/AUTOLOAD |Specifies how new packages will be loaded by App-V 5.0 on a specific computer. The following options are enabled: [1]; automatically load all packages [2]; or automatically load no packages [0]. Example usage:<p><p>**/AUTOLOAD=[0\|1\|2\]** |
-    <tr class="odd">
+   |/SHAREDCONTENTSTOREMODE |Specifies that streamed package contents will be not be saved to the local hard disk. Example usage: <p><p>**/SHAREDCONTENTSTOREMODE=[0\|1\]** |
-    <td align="left"><p>/INSTALLDIR</p></td>
+   |/MIGRATIONMODE |Allows the App-V 5.0 client to modify the shortcuts and FTAs that are associated with the packages that are created with a previous version. Example usage:<p><p>**/MIGRATIONMODE=[0\|1\]** |
-    <td align="left"><p>Specifies the installation directory. Example usage: <strong>/INSTALLDIR=C:\Program Files\AppV Client</strong></p></td>
+   |/ENABLEPACKAGESCRIPTS |Enables the scripts that are defined in the package manifest file or configuration files that should run. Example usage:<p><p>**/ENABLEPACKAGESCRIPTS=[0\|1\]** |
-    </tr>
+   |/ROAMINGREGISTRYEXCLUSIONS |Specifies the registry paths that will not roam with a user profile. Example usage:<p><p>**/ROAMINGREGISTRYEXCLUSIONS=software\classes;software\clients** |
-    <tr class="even">
+   |/ROAMINGFILEEXCLUSIONS |Specifies the file paths relative to %userprofile% that do not roam with a user's profile. Example usage: <p><p>**/ROAMINGFILEEXCLUSIONS 'desktop;my pictures'** |
-    <td align="left"><p>/CEIPOPTIN</p></td>
+   |/S[1-5]PUBLISHINGSERVERNAME |Displays the name of the publishing server. Example usage:<p><p>**/S2PUBLISHINGSERVERNAME=MyPublishingServer** |
-    <td align="left"><p>Enables participation in the Customer Experience Improvement Program. Example usage: <strong>/CEIPOPTIN=[0|1]</strong></p></td>
+   |/S[1-5]PUBLISHINGSERVERURL |Displays the URL of the publishing server. Example usage:<p><p>**/S2PUBLISHINGSERVERURL=\\pubserver** |
-    </tr>
+   |/S[1-5]GLOBALREFRESHENABLED|Enables a global publishing refresh. Example usage:<p><p>**/S2GLOBALREFRESHENABLED=[0\|1\]** |
-    <tr class="odd">
+   |/S[1-5]GLOBALREFRESHONLOGON |Initiates a global publishing refresh when a user logs on. Example usage:<p><p>**/S2LOGONREFRESH=[0\|1\]** |
-    <td align="left"><p>/MUOPTIN</p></td>
+   |/S[1-5]GLOBALREFRESHINTERVAL |Specifies the publishing refresh interval, where **0** indicates do not periodically refresh. Example usage: **/S2PERIODICREFRESHINTERVAL=[0-744]** |
-    <td align="left"><p>Enables Microsoft Update. Example usage: <strong>/MUOPTIN=[0|1]</strong></p></td>
+   |/S[1-5]GLOBALREFRESHINTERVALUNIT |Specifies the interval unit (Hours[0], Days[1]). Example usage:<p><p>**/S2GLOBALREFRESHINTERVALUNIT=[0\|1\]** |
-    </tr>
+   |/S[1-5]USERREFRESHENABLED |Enables user publishing refresh. Example usage: **/S2USERREFRESHENABLED=[0\|1\]** |
-    <tr class="even">
+   |/S[1-5]USERREFRESHONLOGON |Initiates a user publishing refresh when a user logs on. Example usage:<p><p>**/S2LOGONREFRESH=[0\|1\]** |
-    <td align="left"><p>/PACKAGEINSTALLATIONROOT</p></td>
+   |/S[1-5]USERREFRESHINTERVAL |Specifies the publishing refresh interval, where **0** indicates do not periodically refresh. Example usage: **/S2PERIODICREFRESHINTERVAL=[0-744]** |
-    <td align="left"><p>Specifies the directory in which to install all new applications and updates. Example usage: <strong>/PACKAGEINSTALLATIONROOT='C:\App-V Packages'</strong></p></td>
+   |/S[1-5]USERREFRESHINTERVALUNIT |Specifies the interval unit (Hours[0], Days[1]). Example usage:<p><p>**/S2USERREFRESHINTERVALUNIT=[0\|1\]** |
-    </tr>
+   |/Log |Specifies a location where the log information is saved. The default location is %Temp%. Example usage:<p><p>**/log C:\logs\log.log** |
-    <tr class="odd">
+   |/q |Specifies an unattended installation. |
-    <td align="left"><p>/PACKAGESOURCEROOT</p></td>
+   |/REPAIR |Repairs a previous client installation. |
-    <td align="left"><p>Overrides the source location for downloading package content. Example usage: <strong>/PACKAGESOURCEROOT='http://packageStore'</strong></p></td>
+   |/NORESTART |Prevents the computer from rebooting after the client installation.<p><p>The parameter prevents the end-user computer from rebooting after each update is installed and lets you schedule the reboot at your convenience. For example, you can install App-V 5.0 SPX and then install Hotfix Package Y without rebooting after the Service Pack installation. After the installation, you must reboot before you start using App-V. |
-    </tr>
+   |/UNINSTALL |Uninstalls the client. |
-    <tr class="even">
+   |/ACCEPTEULA |Accepts the license agreement. This is required for an unattended installation. Example usage:<p><p>**/ACCEPTEULA** or **/ACCEPTEULA=1** |
-    <td align="left"><p>/AUTOLOAD</p></td>
+   |/LAYOUT |Specifies the associated layout action. It also extracts the Windows Installer (.msi) and script files to a folder without installing App-V 5.0. No value is expected. |
-    <td align="left"><p>Specifies how new packages will be loaded by App-V 5.0 on a specific computer. The following options are enabled: [1]; automatically load all packages [2]; or automatically load no packages [0].<strong>Example usage: /AUTOLOAD=[0|1|2]</strong></p></td>
+   |/LAYOUTDIR |Specifies the layout directory. Requires a string value. Example usage:<p><p>**/LAYOUTDIR=”C:\Application Virtualization Client”** |
-    </tr>
+   |/?, /h, /help |Requests help about the previous installation parameters. |
-    <tr class="odd">
+   ---
-    <td align="left"><p>/SHAREDCONTENTSTOREMODE</p></td>
-    <td align="left"><p>Specifies that streamed package contents will be not be saved to the local hard disk. Example usage: <strong>/SHAREDCONTENTSTOREMODE=[0|1]</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/MIGRATIONMODE</p></td>
-    <td align="left"><p>Allows the App-V 5.0 client to modify the shortcuts and FTAs that are associated with the packages that are created with a previous version. Example usage: <strong>/MIGRATIONMODE=[0|1]</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/ENABLEPACKAGESCRIPTS</p></td>
-    <td align="left"><p>Enables the scripts that are defined in the package manifest file or configuration files that should run. Example usage: <strong>/ENABLEPACKAGESCRIPTS=[0|1]</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/ROAMINGREGISTRYEXCLUSIONS</p></td>
-    <td align="left"><p>Specifies the registry paths that will not roam with a user profile. Example usage: <strong>/ROAMINGREGISTRYEXCLUSIONS=software\classes;software\clients</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/ROAMINGFILEEXCLUSIONS</p></td>
-    <td align="left"><p>Specifies the file paths relative to %userprofile% that do not roam with a user's profile. Example usage: <strong>/ROAMINGFILEEXCLUSIONS 'desktop;my pictures'</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/S[1-5]PUBLISHINGSERVERNAME</p></td>
-    <td align="left"><p>Displays the name of the publishing server. Example usage: <strong>/S2PUBLISHINGSERVERNAME=MyPublishingServer</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/S[1-5]PUBLISHINGSERVERURL</p></td>
-    <td align="left"><p>Displays the URL of the publishing server. Example usage: <strong>/S2PUBLISHINGSERVERURL=\\pubserver</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/S[1-5]GLOBALREFRESHENABLED -</p></td>
-    <td align="left"><p>Enables a global publishing refresh. Example usage: <strong>/S2GLOBALREFRESHENABLED=[0|1]</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/S[1-5]GLOBALREFRESHONLOGON</p></td>
-    <td align="left"><p>Initiates a global publishing refresh when a user logs on. Example usage: <strong>/S2LOGONREFRESH=[0|1]</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/S[1-5]GLOBALREFRESHINTERVAL -</p></td>
-    <td align="left"><p>Specifies the publishing refresh interval, where <strong>0</strong> indicates do not periodically refresh. Example usage: <strong>/S2PERIODICREFRESHINTERVAL=[0-744]</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/S[1-5]GLOBALREFRESHINTERVALUNIT</p></td>
-    <td align="left"><p>Specifies the interval unit (Hours[0], Days[1]). Example usage: <strong>/S2GLOBALREFRESHINTERVALUNIT=[0|1]</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/S[1-5]USERREFRESHENABLED</p></td>
-    <td align="left"><p>Enables user publishing refresh. Example usage: <strong>/S2USERREFRESHENABLED=[0|1]</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/S[1-5]USERREFRESHONLOGON</p></td>
-    <td align="left"><p>Initiates a user publishing refresh when a user logs on. Example usage: <strong>/S2LOGONREFRESH=[0|1]</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/S[1-5]USERREFRESHINTERVAL -</p></td>
-    <td align="left"><p>Specifies the publishing refresh interval, where <strong>0</strong> indicates do not periodically refresh. Example usage: <strong>/S2PERIODICREFRESHINTERVAL=[0-744]</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/S[1-5]USERREFRESHINTERVALUNIT</p></td>
-    <td align="left"><p>Specifies the interval unit (Hours[0], Days[1]). Example usage: <strong>/S2USERREFRESHINTERVALUNIT=[0|1]</strong></p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/Log</p></td>
-    <td align="left"><p>Specifies a location where the log information is saved. The default location is %Temp%. Example usage: <strong>/log C:\logs\log.log</strong></p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/q</p></td>
-    <td align="left"><p>Specifies an unattended installation.</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/REPAIR</p></td>
-    <td align="left"><p>Repairs a previous client installation.</p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/NORESTART</p></td>
-    <td align="left"><p>Prevents the computer from rebooting after the client installation.</p>
-    <p>The parameter prevents the end-user computer from rebooting after each update is installed and lets you schedule the reboot at your convenience. For example, you can install App-V 5.0 SPX and then install Hotfix Package Y without rebooting after the Service Pack installation. After the installation, you must reboot before you start using App-V.</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/UNINSTALL</p></td>
-    <td align="left"><p>Uninstalls the client.</p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/ACCEPTEULA</p></td>
-    <td align="left"><p>Accepts the license agreement. This is required for an unattended installation. Example usage: <strong>/ACCEPTEULA</strong> or <strong>/ACCEPTEULA=1</strong>.</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/LAYOUT</p></td>
-    <td align="left"><p>Specifies the associated layout action. It also extracts the Windows Installer (.msi) and script files to a folder without installing App-V 5.0. No value is expected.</p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>/LAYOUTDIR</p></td>
-    <td align="left"><p>Specifies the layout directory. Requires a string value. Example usage: <strong>/LAYOUTDIR=”C:\Application Virtualization Client”</strong>.</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>/?, /h, /help</p></td>
-    <td align="left"><p>Requests help about the previous installation parameters.</p></td>
-    </tr>
-    </tbody>
-    </table>
-
-     
 
 **To install the App-V 5.0 client by using the Windows Installer (.msi) file**
 
@@ -288,35 +126,13 @@ Use the following procedure to install the Microsoft Application Virtualization
 
 3. Deploy one of the following Windows Installer files to the target computer. The file that you specify must match the configuration of the target computer.
 
-    <table>
+   |Type of deployment |Deploy this file |
-    <colgroup>
+   |---|---|
-    <col width="50%" />
+   |Computer is running a 32-bit Microsoft Windows operating system |appv_client_MSI_x86.msi |
-    <col width="50%" />
+   |Computer is running a 64-bit Microsoft Windows operating system |appv_client_MSI_x64.msi |
-    </colgroup>
+   |You are deploying the App-V 5.0 Remote Desktop Services client |appv_client_rds_MSI_x64.msi |
-    <thead>
+   ---
-    <tr class="header">
-    <th align="left">Type of deployment</th>
-    <th align="left">Deploy this file</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr class="odd">
-    <td align="left"><p>Computer is running a 32-bit Microsoft Windows operating system</p></td>
-    <td align="left"><p>appv_client_MSI_x86.msi</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>Computer is running a 64-bit Microsoft Windows operating system</p></td>
-    <td align="left"><p>appv_client_MSI_x64.msi</p></td>
-    </tr>
-    <tr class="odd">
-    <td align="left"><p>You are deploying the App-V 5.0 Remote Desktop Services client</p></td>
-    <td align="left"><p>appv_client_rds_MSI_x64.msi</p></td>
-    </tr>
-    </tbody>
-    </table>
-
  
-
 4. Using the information in the following table, select the appropriate language pack **.msi** to install, based on the desired language for the target computer. The **xxxx** in the table refers to the target locale of the language pack.
 
    **What to know before you start:** 
@@ -327,32 +143,13 @@ Use the following procedure to install the Microsoft Application Virtualization
 
    -  To deploy additional language packs on a target computer, use the procedure **To install the App-V 5.0 client by using Windows Installer (.msi) file**.
 
-    <table>
+   |Type of deployment |Deploy this file |
-    <colgroup>
+   |---|---|
-    <col width="50%" />
+   |Computer is running a 32-bit Microsoft Windows operating system |appv_client_LP_xxxx_ x86.msi |
-    <col width="50%" />
+   |Computer is running a 64-bit Microsoft Windows operating system |appv_client_LP_xxxx_ x64.msi |
-    </colgroup>
+   ---
-    <thead>
-    <tr class="header">
-    <th align="left">Type of deployment</th>
-    <th align="left">Deploy this file</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr class="odd">
-    <td align="left"><p>Computer is running a 32-bit Microsoft Windows operating system</p></td>
-    <td align="left"><p>appv_client_LP_xxxx_ x86.msi</p></td>
-    </tr>
-    <tr class="even">
-    <td align="left"><p>Computer is running a 64-bit Microsoft Windows operating system</p></td>
-    <td align="left"><p>appv_client_LP_xxxx_ x64.msi</p></td>
-    </tr>
-    </tbody>
-    </table>
    
-     
+   **Got a suggestion for App-V**? Add or vote on [suggestions](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). <p><p>**Got an App-V issue?** Use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/home?forum=mdopappv).
-
-    **Got a suggestion for App-V**? Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). **Got an App-V issu**e? Use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/home?forum=mdopappv).
 
 ## Related topics
 
@@ -362,12 +159,3 @@ Use the following procedure to install the Microsoft Application Virtualization
 [About Client Configuration Settings](about-client-configuration-settings.md)
 
 [How to Uninstall the App-V 5.0 Client](how-to-uninstall-the-app-v-50-client.md)
-
- 
-
- 
-
-
-
-
-

windows/client-management/manage-settings-app-with-group-policy.md

@@ -23,7 +23,13 @@ To make use of the Settings App group polices on Windows server 2016, install fi
 
 To centrally manage the new policies copy the ControlPanel.admx and ControlPanel.adml file to [Central Store](https://support.microsoft.com/help/3087759/how-to-create-and-manage-the-central-store-for-group-policy-administra) if your company uses one or the PolicyDefinitions folder of the Domain Controllers used for Group Policy management.
 
-This policy is available at **Computer Configuration** > **Administrative Templates** > **Control Panel** > **Settings Page Visibility**.
+This policy is available for both User and Computer depending on the version of the OS. Windows Server 2016 with KB 4457127 applied will have both User and Computer policy. Windows 10, version 1703, added Computer policy for the Settings app. Windows 10, version 1809, added User policy for the Settings app.
+
+Policy paths:
+
+**Computer Configuration** > **Administrative Templates** > **Control Panel** > **Settings Page Visibility**.
+
+**User Configuration** > **Administrative Templates** > **Control Panel** > **Settings Page Visibility**.
 
 ![Settings page visibility policy](images/settings-page-visibility-gp.png)
 

windows/client-management/mdm/policy-csp-power.md

@@ -348,7 +348,7 @@ If you enable this policy setting, you must provide a value, in seconds, indicat
 
 If you disable or do not configure this policy setting, users control this setting.
 
-If the user has configured a slide show to run on the lock screen when the machine is locked, this can prevent the sleep transition from occuring.  The "Prevent enabling lock screen slide show" policy setting can be used to disable the slide show feature.
+If the user has configured a slide show to run on the lock screen when the machine is locked, this can prevent the sleep transition from occurring.  The "Prevent enabling lock screen slide show" policy setting can be used to disable the slide show feature.
 
 <!--/Description-->
 > [!TIP]
@@ -412,7 +412,7 @@ If you enable this policy setting, you must provide a value, in seconds, indicat
 
 If you disable or do not configure this policy setting, users control this setting.
 
-If the user has configured a slide show to run on the lock screen when the machine is locked, this can prevent the sleep transition from occuring.  The "Prevent enabling lock screen slide show" policy setting can be used to disable the slide show feature.
+If the user has configured a slide show to run on the lock screen when the machine is locked, this can prevent the sleep transition from occurring.  The "Prevent enabling lock screen slide show" policy setting can be used to disable the slide show feature.
 
 <!--/Description-->
 > [!TIP]
@@ -600,7 +600,7 @@ If you enable this policy setting, you must provide a value, in seconds, indicat
 
 If you disable or do not configure this policy setting, users control this setting.
 
-If the user has configured a slide show to run on the lock screen when the machine is locked, this can prevent the sleep transition from occuring.  The "Prevent enabling lock screen slide show" policy setting can be used to disable the slide show feature.
+If the user has configured a slide show to run on the lock screen when the machine is locked, this can prevent the sleep transition from occurring.  The "Prevent enabling lock screen slide show" policy setting can be used to disable the slide show feature.
 
 <!--/Description-->
 > [!TIP]

windows/security/threat-protection/security-policy-settings/account-lockout-policy.md

@@ -18,7 +18,7 @@ ms.date: 10/11/2018
 
 Describes the Account Lockout Policy settings and links to information about each policy setting.
 
-Someone who attempts to use more than a few unsuccessful passwords while trying to log on to your system might be a malicious user who is attempting to determine an account password by trial and error. Windows domain controllers keep track of logon attempts, and domain controllers can be configured to respond to this type of potential attack by disabling the account for a preset period of time. Account Lockout Policy settings control the threshold for this response and the actions to be taken after the threshold is reached. The Account Lockout Policy settings can be configured in the following location in the Group Policy Management Console: **Computer Configuration\\Windows Settings\\Security Settings\\Account Policies\\Account Lockout Policy**.
+Someone who attempts to use more than a few unsuccessful passwords while trying to log on to your system might be a malicious user who is attempting to determine an account password by trial and error. Windows domain controllers keep track of logon attempts, and domain controllers can be configured to respond to this type of potential attack by disabling the account for a preset period of time. Account Lockout Policy settings control the threshold for this response and the actions to be taken after the threshold is reached. The Account Lockout Policy settings can be configured in the following location in the Group Policy Management Console: **Computer Configuration\\Policies\\Windows Settings\\Security Settings\\Account Policies\\Account Lockout Policy**.
 
 The following topics provide a discussion of each policy setting's implementation and best practices considerations, policy location, default values for the server type or Group Policy Object (GPO), relevant differences in operating system versions, and security considerations (including the possible vulnerabilities of each policy setting), countermeasures that you can implement, and the potential impact of implementing the countermeasures.