Merge remote-tracking branch 'refs/remotes/origin/master' into live

This commit is contained in:
LizRoss 2016-05-11 13:37:14 -07:00
commit 8c833ebfcf

View File

@ -87,7 +87,7 @@ IE opens the apps website.
IE uses Microsofts versionlist.xml or versionlistWin7.xml file to determine whether an ActiveX control should be stopped from loading. These files are updated with newly-discovered out-of-date ActiveX controls, which IE automatically downloads to your local copy of the file. IE uses Microsofts versionlist.xml or versionlistWin7.xml file to determine whether an ActiveX control should be stopped from loading. These files are updated with newly-discovered out-of-date ActiveX controls, which IE automatically downloads to your local copy of the file.
You can see your copy of the file here `%LOCALAPPDATA%\Microsoft\Internet Explorer\VersionManager\versionlist.xml` or you can view Microsofts version, based on your operating system and version of IE, here: You can see your copy of the file here `%LOCALAPPDATA%\Microsoft\Internet Explorer\VersionManager\versionlist.xml` or you can view Microsofts version, based on your operating system and version of IE, here:
- [Internet Explorer 11 on Windows 7 SP1 or Windows Server 2008 R2](http://go.microsoft.com/fwlink/p/?LinkId=403864) - [Internet Explorer 11 on Windows 7 SP1 or Windows Server 2008 R2](http://go.microsoft.com/fwlink/p/?LinkId=798230)
- [All other configurations](https://go.microsoft.com/fwlink/p/?LinkId=403864) - [All other configurations](https://go.microsoft.com/fwlink/p/?LinkId=403864)
**Security Note:**<br>Although we strongly recommend against it, if you dont want your computer to automatically download the updated version list from Microsoft, run the following command from a command prompt: **Security Note:**<br>Although we strongly recommend against it, if you dont want your computer to automatically download the updated version list from Microsoft, run the following command from a command prompt: