From 0adcb6edf6e94d19bc6304ed478d52544002aef7 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Mon, 25 Apr 2016 16:40:05 -0700 Subject: [PATCH 01/11] Updating to remove sharing info, pulling out of product --- .../manage/manage-wifi-sense-in-enterprise.md | 46 +++---------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/windows/manage/manage-wifi-sense-in-enterprise.md b/windows/manage/manage-wifi-sense-in-enterprise.md index f51da76256..b6585ddf41 100644 --- a/windows/manage/manage-wifi-sense-in-enterprise.md +++ b/windows/manage/manage-wifi-sense-in-enterprise.md @@ -2,7 +2,7 @@ title: Manage Wi-Fi Sense in your company (Windows 10) description: Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. ms.assetid: 1845e00d-c4ee-4a8f-a5e5-d00f2735a271 -keywords: ["WiFi Sense", "Shared networks"] +keywords: ["WiFi Sense"] ms.prod: W10 ms.mktglfcycl: manage ms.sitesec: library @@ -15,25 +15,17 @@ author: eross-msft - Windows 10 - Windows 10 Mobile -Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. It can connect you to open Wi-Fi hotspots it knows about through crowdsourcing, or to Wi-Fi networks your contacts have shared with you by using Wi-Fi Sense. +Wi-Fi Sense learns about open Wi-Fi hotspots your Windows PC or Windows phone connects to by collecting information about the network, like whether the open Wi-Fi network has a high-quality connection to the Internet. By using that information from your device and from other Wi-Fi Sense customers' devices too, Wi-Fi Sense builds a database of these high-quality networks. When you’re in range of one of these Wi-Fi hotspots, you automatically get connected to it. The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10.

**Note**
Wi-Fi Sense isn’t available in all countries or regions. ## How does Wi-Fi Sense work? -Wi-Fi Sense connects your employees to the available Wi-Fi networks, including: - -- **Open Wi-Fi networks.** Wi-Fi Sense uses crowdsourcing to find the networks that other Windows users are connected to. Typically, these are the open (no password required) Wi-Fi hotspots you see when you’re out and about. - -- **Shared Wi-Fi networks.** Wi-Fi Sense uses the Wi-Fi networks that your employee shares with Facebook friends, Outlook.com contacts, or Skype contacts. Sharing doesn’t happen automatically; an employee must connect to a network, enter the network password, and then choose the **Share network with my contacts** box before the network is shared. - -**Important**
Wi-Fi Sense lets your employees share your network access with their contacts, without telling their contacts the actual network password. Should the contact want to share your network with another contact, he or she would have to share the network directly, by providing the password and clicking to share the network. - -Employees can't share network info with their contacts for any company network using the IEEE 802.1X protocol. +Wi-Fi Sense connects your employees to open Wi-Fi networks, using crowdsourcing to find the networks that other Windows users are connected to. Typically, these are the open (no password required) Wi-Fi hotspots you see when you’re out and about. ## How to manage Wi-Fi Sense in your company In a company environment, you will most likely deploy Windows 10 to your employees' PCs using your preferred deployment method and then manage their settings globally. With that in mind, you have a few options for managing how your employees will use Wi-Fi Sense. -

**Important**
Turning off Wi-Fi Sense also turns off all related features, including: connecting automatically to open hotspots, connecting automatically to networks shared by contacts, and sharing networks with contacts. +

**Important**
Turning off Wi-Fi Sense stops employees from connecting automatically to open hotspots. ### Using Group Policy (available starting with Windows 10, version 1511) You can manage your Wi-Fi Sense settings by using Group Policy and your Group Policy editor. @@ -42,6 +34,8 @@ You can manage your Wi-Fi Sense settings by using Group Policy and your Group Po 1. Open your Group Policy editor and go to the `Computer Configuration\Administrative Templates\Network\WLAN Service\WLAN Settings\Allow Windows to automatically connect to suggested open hotspots, to networks shared by contacts, and to hotspots offering paid services` setting. + + ![Group Policy Editor, showing the Wi-Fi Sense setting](images/wifisense-grouppolicy.png) 2. Turn Wi-Fi Sense on (enabled) or off (disabled), based on your company's environment. @@ -75,36 +69,10 @@ If your company still uses Unattend, you can manage your Wi-Fi Sense settings by

Setting this value to **0** turns off Wi-Fi Sense and all Wi-Fi sense features. When turned off, the Wi-Fi Sense settings still appear on the **Wi-Fi Settings** screen, but can't be controlled by the employee and all of the Wi-Fi Sense features are turned off. For more info, see the Unattended Windows Setup Reference topic, [WiFiSenseAllowed](http://go.microsoft.com/fwlink/p/?LinkId=620910). ### How employees can change their own Wi-Fi Sense settings -If you don’t turn off the ability for your employees to use Wi-Fi Sense, they can turn the settings on locally by selecting **Settings > Network & Internet > Wi-Fi > Manage Wi-Fi settings**, and then changing one or both of these settings under **Wi-Fi Sense**: - -- Connect to suggested open hotspots - -- Connect to networks shared by my contacts +If you don’t turn off the ability for your employees to use Wi-Fi Sense, they can turn it on locally by selecting **Settings > Network & Internet > Wi-Fi > Manage Wi-Fi settings**, and then turning on **Connect to suggested open hotspots**. ![Wi-Fi Sense options shown to employees if it's not turned off](images/wifisense-settingscreens.png) -## Important considerations -Whether to allow your employees to share your password-protected Wi-Fi networks with their contacts to give them Internet access is completely up to you. However, if you decide to allow it, you should consider the following important info. - -### Network considerations -- Wi-Fi Sense is designed to block contacts given Internet access through your password-protected network from reaching your intranet sites and other devices or files on the shared network. - -- Network info can only be shared with contacts using Wi-Fi Sense on PCs running Windows 10 or phones running Windows 10 Mobile. Wi-Fi Sense won’t work with any other operating system. - -### Security considerations -- Your employees must be connected using a Microsoft account to use Wi-Fi Sense. - -- Your employees can’t pick individual contacts to share with. Instead, they must pick a group of contacts, such as their Skype contacts. In this case, all of the employee’s Skype contacts will be able to access the shared network. - -- Wi-Fi Sense is designed to block contacts from seeing the Wi-Fi network password. For networks you choose to share access to, the password is sent over an encrypted connection, stored in an encrypted file on a Microsoft server, and then sent over an HTTPS connection to the contacts' PC or phone if they use Wi-Fi Sense. - -- Access is only shared with your employee’s contacts. Wi-Fi Sense doesn't share networks with the contact's contacts. Should the contact want to share your network with another contact, he or she would have to share the network directly, by providing the password and clicking to share the network. - -### Sharing considerations -- Employees can't share network info with their contacts for any company network using the IEEE 802.1X protocol. - -- Your employees can pick which Wi-Fi networks they want to share. The first time the employee connects to a password-protected Wi-Fi network, they’re presented with an option to share the network and to pick the contacts that should be given the info. - ## Related topics - [Wi-Fi Sense FAQ](http://go.microsoft.com/fwlink/p/?LinkId=620911) - [How to configure Wi-Fi Sense on Windows 10 in an enterprise](http://go.microsoft.com/fwlink/p/?LinkId=620959) From 3b518c7acbd7818c192ca80c2a60b46d140fe7a7 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 26 Apr 2016 07:26:28 -0700 Subject: [PATCH 02/11] Removing credential sharing info --- windows/manage/manage-wifi-sense-in-enterprise.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/windows/manage/manage-wifi-sense-in-enterprise.md b/windows/manage/manage-wifi-sense-in-enterprise.md index b6585ddf41..805c6b7b0b 100644 --- a/windows/manage/manage-wifi-sense-in-enterprise.md +++ b/windows/manage/manage-wifi-sense-in-enterprise.md @@ -2,7 +2,7 @@ title: Manage Wi-Fi Sense in your company (Windows 10) description: Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. ms.assetid: 1845e00d-c4ee-4a8f-a5e5-d00f2735a271 -keywords: ["WiFi Sense"] +keywords: ["WiFi Sense", "automatically connect to wi-fi", "wi-fi hotspot connection"] ms.prod: W10 ms.mktglfcycl: manage ms.sitesec: library @@ -18,14 +18,19 @@ author: eross-msft Wi-Fi Sense learns about open Wi-Fi hotspots your Windows PC or Windows phone connects to by collecting information about the network, like whether the open Wi-Fi network has a high-quality connection to the Internet. By using that information from your device and from other Wi-Fi Sense customers' devices too, Wi-Fi Sense builds a database of these high-quality networks. When you’re in range of one of these Wi-Fi hotspots, you automatically get connected to it. The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10. -

**Note**
Wi-Fi Sense isn’t available in all countries or regions. + +**Note**
Wi-Fi Sense isn’t available in all countries or regions. + +**Important**
We've deprecated the Wi-Fi Sense credential sharing functionality, which means that while you currently see it in the user interface, it's non-functional. The feature and its associated text will be fully-removed from future releases. ## How does Wi-Fi Sense work? Wi-Fi Sense connects your employees to open Wi-Fi networks, using crowdsourcing to find the networks that other Windows users are connected to. Typically, these are the open (no password required) Wi-Fi hotspots you see when you’re out and about. + ## How to manage Wi-Fi Sense in your company In a company environment, you will most likely deploy Windows 10 to your employees' PCs using your preferred deployment method and then manage their settings globally. With that in mind, you have a few options for managing how your employees will use Wi-Fi Sense. -

**Important**
Turning off Wi-Fi Sense stops employees from connecting automatically to open hotspots. + +**Important**
Turning off Wi-Fi Sense stops employees from connecting automatically to open hotspots. ### Using Group Policy (available starting with Windows 10, version 1511) You can manage your Wi-Fi Sense settings by using Group Policy and your Group Policy editor. @@ -34,8 +39,6 @@ You can manage your Wi-Fi Sense settings by using Group Policy and your Group Po 1. Open your Group Policy editor and go to the `Computer Configuration\Administrative Templates\Network\WLAN Service\WLAN Settings\Allow Windows to automatically connect to suggested open hotspots, to networks shared by contacts, and to hotspots offering paid services` setting. - - ![Group Policy Editor, showing the Wi-Fi Sense setting](images/wifisense-grouppolicy.png) 2. Turn Wi-Fi Sense on (enabled) or off (disabled), based on your company's environment. From 07762a08b98480d0669f06cd48a919d7fc416134 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 26 Apr 2016 07:39:57 -0700 Subject: [PATCH 03/11] Removing credential sharing --- windows/manage/manage-wifi-sense-in-enterprise.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/manage/manage-wifi-sense-in-enterprise.md b/windows/manage/manage-wifi-sense-in-enterprise.md index 805c6b7b0b..4ad66b165f 100644 --- a/windows/manage/manage-wifi-sense-in-enterprise.md +++ b/windows/manage/manage-wifi-sense-in-enterprise.md @@ -74,10 +74,10 @@ If your company still uses Unattend, you can manage your Wi-Fi Sense settings by ### How employees can change their own Wi-Fi Sense settings If you don’t turn off the ability for your employees to use Wi-Fi Sense, they can turn it on locally by selecting **Settings > Network & Internet > Wi-Fi > Manage Wi-Fi settings**, and then turning on **Connect to suggested open hotspots**. - ![Wi-Fi Sense options shown to employees if it's not turned off](images/wifisense-settingscreens.png) +![Wi-Fi Sense options shown to employees if it's not turned off](images/wifisense-settingscreens.png) ## Related topics -- [Wi-Fi Sense FAQ](http://go.microsoft.com/fwlink/p/?LinkId=620911) +- [Wi-Fi Sense and Privacy](http://go.microsoft.com/fwlink/p/?LinkId=620911) - [How to configure Wi-Fi Sense on Windows 10 in an enterprise](http://go.microsoft.com/fwlink/p/?LinkId=620959)   From ee8c8ce27271fb076806eebc5c9a146adedbf8c4 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 26 Apr 2016 12:42:58 -0700 Subject: [PATCH 04/11] Updating to remove sharing info --- windows/manage/manage-wifi-sense-in-enterprise.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/windows/manage/manage-wifi-sense-in-enterprise.md b/windows/manage/manage-wifi-sense-in-enterprise.md index 4ad66b165f..58d0eadae7 100644 --- a/windows/manage/manage-wifi-sense-in-enterprise.md +++ b/windows/manage/manage-wifi-sense-in-enterprise.md @@ -19,13 +19,10 @@ Wi-Fi Sense learns about open Wi-Fi hotspots your Windows PC or Windows phone co The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10. -**Note**
Wi-Fi Sense isn’t available in all countries or regions. - -**Important**
We've deprecated the Wi-Fi Sense credential sharing functionality, which means that while you currently see it in the user interface, it's non-functional. The feature and its associated text will be fully-removed from future releases. +**Note**
Wi-Fi Sense isn’t available in all countries or regions. ## How does Wi-Fi Sense work? -Wi-Fi Sense connects your employees to open Wi-Fi networks, using crowdsourcing to find the networks that other Windows users are connected to. Typically, these are the open (no password required) Wi-Fi hotspots you see when you’re out and about. - +Wi-Fi Sense connects your employees to open Wi-Fi networks. Typically, these are the open (no password required) Wi-Fi hotspots you see when you’re out and about. ## How to manage Wi-Fi Sense in your company In a company environment, you will most likely deploy Windows 10 to your employees' PCs using your preferred deployment method and then manage their settings globally. With that in mind, you have a few options for managing how your employees will use Wi-Fi Sense. @@ -76,6 +73,14 @@ If you don’t turn off the ability for your employees to use Wi-Fi Sense, they ![Wi-Fi Sense options shown to employees if it's not turned off](images/wifisense-settingscreens.png) +**Important**
The service that was used to share networks with Facebook friends, Outlook.com contacts, or Skype contacts is no longer available. This means: + +The **Connect to networks shared by my contacts** setting will still appear in **Settings > Network & Internet > Wi-Fi > Manage Wi-Fi settings** on your PC and in **Settings > Network & wireless > Wi‑Fi > Wi‑Fi Sense** on your phone. However, this setting will have no effect now. Regardless of what it’s set to, networks won’t be shared with your contacts. Your contacts won’t be connected to networks you’ve shared with them, and you won’t be connected to networks they’ve shared with you. + +Even if you selected **Automatically connect to networks shared by your contacts** when you first set up your Windows 10 device, you still won’t be connected to networks your contacts have shared with you. + +If you select the **Share network with my contacts** check box the first time you connect to a new network, the network won’t be shared. + ## Related topics - [Wi-Fi Sense and Privacy](http://go.microsoft.com/fwlink/p/?LinkId=620911) - [How to configure Wi-Fi Sense on Windows 10 in an enterprise](http://go.microsoft.com/fwlink/p/?LinkId=620959) From 8e098201758d1630c837defd70ae24e461fb1267 Mon Sep 17 00:00:00 2001 From: Xiaokai He Date: Wed, 11 May 2016 11:22:18 -0700 Subject: [PATCH 05/11] add files to the new edu docset --- .openpublishing.publish.config.json | 10 ++ education/TOC.md | 21 ++++ education/docfx.json | 24 ++++ education/index.md | 182 ++++++++++++++++++++++++++++ 4 files changed, 237 insertions(+) create mode 100644 education/TOC.md create mode 100644 education/docfx.json create mode 100644 education/index.md diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index e58deb3585..469538cd59 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -61,6 +61,16 @@ "type_mapping": { "Conceptual": "Content" } + }, + { + "docset_name": "education", + "build_output_subfolder": "education", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": "false", + "type_mapping": { + "Conceptual": "Content" + } } ], "notification_subscribers": ["brianlic@microsoft.com"], diff --git a/education/TOC.md b/education/TOC.md new file mode 100644 index 0000000000..56e5ab8cd5 --- /dev/null +++ b/education/TOC.md @@ -0,0 +1,21 @@ +# [Microsoft Desktop Optimization Pack](index.md) +## [Advanced Group Policy Management](agpm/) +## [Application Virtualization]() +### [Application Virtualization 5](appv-v5/) +### [Application Virtualization 4](appv-v4/) +### [SoftGrid Application Virtualization](softgrid-application-virtualization.md) +## [Diagnostics and Recovery Toolset]() +### [Diagnostics and Recovery Toolset 10](dart-v10/) +### [Diagnostics and Recovery Toolset 8](dart-v8/) +### [Diagnostics and Recovery Toolset 7](dart-v7/) +### [Diagnostics and Recovery Toolset 6.5](dart-v65.md) +## [Microsoft Bitlocker Administration and Monitoring]() +### [Microsoft Bitlocker Administration and Monitoring 2.5](mbam-v25/) +### [Microsoft Bitlocker Administration and Monitoring 2](mbam-v2/) +### [Microsoft Bitlocker Administration and Monitoring 1](mbam-v1/) +## [Microsoft Enterprise Desktop Virtualization]() +### [Microsoft Enterprise Desktop Virtualization 2](medv-v2/) +## [User Experience Virtualization]() +### [User Experience Virtualization 2](uev-v2/) +### [User Experience Virtualization 1](uev-v1/) +## [MDOP Solutions and Scenarios](solutions/) \ No newline at end of file diff --git a/education/docfx.json b/education/docfx.json new file mode 100644 index 0000000000..85ad44817c --- /dev/null +++ b/education/docfx.json @@ -0,0 +1,24 @@ +{ + "build": { + "content": + [ + { + "files": ["**/**.md"], + "exclude": ["**/obj/**"] + } + ], + "resource": [ + { + "files": ["**/images/**", "**/*.json"], + "exclude": ["**/obj/**"] + } + ], + "globalMetadata": { + "ROBOTS": "INDEX, FOLLOW" + }, + "externalReference": [ + ], + "template": "op.html", + "dest": "edu" + } +} \ No newline at end of file diff --git a/education/index.md b/education/index.md new file mode 100644 index 0000000000..4632622c96 --- /dev/null +++ b/education/index.md @@ -0,0 +1,182 @@ +--- +title: MDOP Information Experience +description: MDOP Information Experience +ms.assetid: 12b8ab56-3267-450d-bb22-1c7e44cb8e52 +author: jamiejdt +--- + +# MDOP Information Experience + + +The Microsoft Desktop Optimization Pack (MDOP) is a portfolio of technologies available as a subscription for Software Assurance customers. MDOP helps to improve compatibility and management, reduce support costs, improve asset management, and improve policy control. + +The MDOP Information Experience provides product documentation, videos, blogs, and other resources to help users implement and optimize their experience with the MDOP technologies. You can learn about updates and events by following us on [Facebook](http://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](http://go.microsoft.com/fwlink/p/?LinkId=242447). + +## MDOP Documentation Links + + +The following table provides links to the product documentation for the MDOP products by version. + + ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Microsoft Advanced Group Policy Management (AGPM) extends the capabilities of the Group Policy Management Console (GPMC) to provide change control and improved management.

+

AGPM 4.0 SP3 – Windows 10, Windows 8.1, Windows 8, Windows 7, Windows Vista SP1, Windows Server 2012, Windows Server 2012 R2, Windows Server 2008, Windows Server 2008 R2

+

AGPM 4.0 SP2 - Windows 8.1, Windows 8, Windows 7, Windows Vista SP1, Windows Server 2012, Windows Server 2008, Windows Server 2008 R2

+

AGPM 4.0 SP1 - Windows 8, Windows 7, Windows Vista SP1, Windows Server 2012, Windows Server 2008, Windows Server 2008 R2

+

AGPM 4.0 - Windows Vista SP1, Windows 7, Windows Server 2008, Windows Server 2008 R2

+

AGPM 3.0- Windows Vista SP1, Windows Server 2008

+

AGPM 2.5 - Windows Vista, Windows Server 2003

[Overview of Microsoft Advanced Group Policy Management](http://go.microsoft.com/fwlink/p/?LinkId=232980)(http://go.microsoft.com/fwlink/p/?LinkId=232980)

+

[AGPM 4.0 SP3](https://technet.microsoft.com/library/mt346468.aspx) (https://technet.microsoft.com/library/mt346468.aspx)

+

[AGPM 4.0 SP2](http://go.microsoft.com/fwlink/p/?LinkId=325035) (http://go.microsoft.com/fwlink/p/?LinkId=325035)

+

[AGPM 4.0 SP1](http://go.microsoft.com/fwlink/p/?LinkId=286715) (http://go.microsoft.com/fwlink/p/?LinkId=286715)

+

[AGPM 4.0](http://go.microsoft.com/fwlink/p/?LinkId=232964) (http://go.microsoft.com/fwlink/p/?LinkId=232964)

+

[AGPM 3.0](http://go.microsoft.com/fwlink/p/?LinkId=232967) (http://go.microsoft.com/fwlink/p/?LinkId=232967)

+

[AGPM 2.5](http://go.microsoft.com/fwlink/p/?LinkId=232969) (http://go.microsoft.com/fwlink/p/?LinkId=232969)

+

[AGPM Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=232275) (http://go.microsoft.com/fwlink/p/?LinkId=232275)

Microsoft Application Virtualization (App-V) lets you make applications available to end user computers without installing the applications directly on those computers.

[Microsoft Application Virtualization 5.1 Administrator's Guide](appv-v5/microsoft-application-virtualization-51-administrators-guide.md)

+

[About App-V 5.0 SP3](appv-v5/about-app-v-50-sp3.md)

+

[About App-V 5.0 SP2](appv-v5/about-app-v-50-sp2.md)

+

[About App-V 5.0 SP1](appv-v5/about-app-v-50-sp1.md)

+

[Microsoft Application Virtualization 5.0 Administrator's Guide](appv-v5/microsoft-application-virtualization-50-administrators-guide.md)

+

[About Microsoft Application Virtualization 4.6 SP3](appv-v4/about-microsoft-application-virtualization-46-sp3.md)

+

[About Microsoft Application Virtualization 4.6 SP2](appv-v4/about-microsoft-application-virtualization-46-sp2.md)

+

[About Microsoft Application Virtualization 4.6 SP1](appv-v4/about-microsoft-application-virtualization-46-sp1.md)

+

[About Microsoft Application Virtualization 4.6](appv-v4/about-microsoft-application-virtualization-46.md)

+

[About Microsoft Application Virtualization 4.5](appv-v4/about-microsoft-application-virtualization-45.md)

+

[SoftGrid](http://go.microsoft.com/fwlink/p/?LinkId=232981) (http://go.microsoft.com/fwlink/p/?LinkId=232981)

+

[App-V Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=231902) (http://go.microsoft.com/fwlink/p/?LinkId=231902)

+

[App-V 5.0 eBooks](http://go.microsoft.com/fwlink/p/?LinkId=309570) (http://go.microsoft.com/fwlink/p/?LinkId=309570)

Microsoft BitLocker Administration and Monitoring (MBAM) provides an administrative interface to enterprise-wide BitLocker drive encryption.

[Microsoft BitLocker Administration and Monitoring 2.5](mbam-v25/index.md)

+

[MBAM 2.5 Video Demonstration: Deploying MBAM 2.5](http://go.microsoft.com/fwlink/?LinkId=518206) (http://go.microsoft.com/fwlink/?LinkId=518206)

+

[About MBAM 2.5 SP1](mbam-v25/about-mbam-25-sp1.md)

+

[About MBAM 2.0 SP1](mbam-v2/about-mbam-20-sp1.md)

+

[Microsoft BitLocker Administration and Monitoring 2 Administrator's Guide](mbam-v2/index.md)

+

[Microsoft BitLocker Administration and Monitoring 1 Administrator's Guide](mbam-v1/index.md)

+

[MBAM Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=231905) (http://go.microsoft.com/fwlink/p/?LinkId=231905)

+

[MBAM 1.0 eBooks](http://go.microsoft.com/fwlink/p/?LinkId=309571) (http://go.microsoft.com/fwlink/p/?LinkId=309571)

Microsoft Diagnostics and Recovery Toolset (DaRT) helps troubleshoot and repair Windows-based computers.

+

DaRT 10 - Windows 10

+

DaRT 8.1 - Windows 8.1, Windows Server 2012 R2

+

DaRT 8.0 SP1 - Windows 8, Windows Server 2012

+

DaRT 8.0 - Windows 8, Windows Server 2012

+

DaRT 7.0 - Windows 7, Windows Server 2008 R2

+

DaRT 6.5 - Windows 7, Windows Server 2008 R2

+

DaRT 6.0 - Windows Vista, Windows Server 2008

+

DaRT 5.0 - Windows 2000, Windows XP, Windows Server 2003

[Diagnostics and Recovery Toolset 10](dart-v10/index.md)

+

[About DaRT 8.1](dart-v8/about-dart-81.md)

+

[About DaRT 8.0 SP1](dart-v8/about-dart-80-sp1.md)

+

[Diagnostics and Recovery Toolset 8 Administrator's Guide](dart-v8/index.md)

+

[Diagnostics and Recovery Toolset 7 Administrator's Guide](dart-v7/index.md)

+

[DaRT 6.5](http://go.microsoft.com/fwlink/p/?LinkId=232983) (http://go.microsoft.com/fwlink/p/?LinkId=232983)

+

[DaRT Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=232274) (http://go.microsoft.com/fwlink/p/?LinkId=232274)

+

[DaRT 8.0 eBook](http://go.microsoft.com/fwlink/p/?LinkId=309573) (http://go.microsoft.com/fwlink/p/?LinkId=309573)

+

[DaRT 7.0 eBook](http://go.microsoft.com/fwlink/p/?LinkId=309572) (http://go.microsoft.com/fwlink/p/?LinkId=309572)

Microsoft Desktop Enterprise Monitoring (DEM) monitors and reports enterprise-wide desktop application and system failures.

[DEM 3.5](http://go.microsoft.com/fwlink/p/?LinkId=232985) (http://go.microsoft.com/fwlink/p/?LinkId=232985)

+

[DEM Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=232276) (http://go.microsoft.com/fwlink/p/?LinkId=232276)

Microsoft Enterprise Desktop Virtualization (MED-V) uses Microsoft Virtual PC to provide an enterprise solution for desktop virtualization.

+

MED-V 2.0 - Windows 7

+

MED-V 1.0 SP1 - Windows 7, Windows Vista, Windows XP

+

MED-V 1.0 - Windows Vista, Windows XP

[Microsoft Enterprise Desktop Virtualization 2.0](medv-v2/index.md)

+

[About MED-V 1.0 SP1](medv-v1/about-med-v-10-sp1.md)

+

[Microsoft Enterprise Desktop Virtualization 1.0](medv-v1/index.md)

+

[MED-V Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=231903) (http://go.microsoft.com/fwlink/p/?LinkId=231903)

Microsoft User Experience Virtualization (UE-V) captures settings to apply to computers accessed by the user including desktop computers, laptop computers, and VDI sessions.

[Microsoft User Experience Virtualization (UE-V) 2.x](uev-v2/index.md)

+

[What's New in UE-V 2.1 SP1](uev-v2/whats-new-in-ue-v-21-sp1uevv21-sp1.md)

+

[What's New in UE-V 2.1](uev-v2/whats-new-in-ue-v-21-new-uevv2.md)

+

[What's New in UE-V 2.0](uev-v2/whats-new-in-ue-v-20-new-uevv2.md)

+

[About User Experience Virtualization 1.0 SP1](uev-v1/about-user-experience-virtualization-10-sp1.md)

+

[Microsoft User Experience Virtualization (UE-V) 1.0](uev-v1/index.md)

+

[UE-V 1.0 eBooks](http://go.microsoft.com/fwlink/p/?LinkId=309574) (http://go.microsoft.com/fwlink/p/?LinkId=309574)

[MDOP Solutions and Scenarios](solutions/index.md)

[Virtualizing Microsoft Office 2013 for Application Virtualization (App-V) 5.0](solutions/virtualizing-microsoft-office-2013-for-application-virtualization--app-v--50-solutions.md)

+

[Virtualizing Microsoft Office 2010 for Application Virtualization (App-V) 5.0](solutions/virtualizing-microsoft-office-2010-for-application-virtualization--app-v--50-solutions.md)

+

[Creating App-V 4.5 Databases Using SQL Scripting](solutions/creating-app-v-45-databases-using-sql-scripting.md)

+

[Application Publishing and Client Interaction for App-V 5](solutions/application-publishing-and-client-interaction-for-app-v-5-solutions.md)

+

[How to Download and Deploy MDOP Group Policy (.admx) Templates](solutions/how-to-download-and-deploy-mdop-group-policy--admx--templates.md)

+ +  + +## Supplemental MDOP Product Guidance + + +In addition to the product documentation available online, supplemental product guidance such as informational videos and virtual labs are available for most MDOP products. + + ++++ + + + + + + + + + + + + + + + + + + +

MDOP Videos

For a list of available MDOP videos, go to [Microsoft Desktop Optimization Pack Technologies Videos](http://go.microsoft.com/fwlink/p/?LinkId=234275) (http://go.microsoft.com/fwlink/p/?LinkId=234275).

MDOP Virtual Labs

For a list of available MDOP virtual labs, go to [Microsoft Desktop Optimization Pack (MDOP) Virtual Labs](http://go.microsoft.com/fwlink/p/?LinkId=234276) (http://go.microsoft.com/fwlink/p/?LinkId=234276).

MDOP TechCenter

For technical whitepapers, evaluation materials, blogs, and additional MDOP resources, go to [MDOP TechCenter](http://go.microsoft.com/fwlink/p/?LinkId=225286) (http://go.microsoft.com/fwlink/p/?LinkId=225286)

+

MDOP Forums

Join in the MDOP community where you can ask and answer questions at the [MDOP TechNet Forum](http://go.microsoft.com/fwlink/p/?LinkId=286973) (http://go.microsoft.com/fwlink/p/?LinkId=286973).

+ +  + +## How to Get MDOP + + +MDOP is a suite of products that can help streamline desktop deployment, management, and support across the enterprise. MDOP is available as an additional subscription for Software Assurance customers. + +**Evaluate MDOP** +MDOP is also available for test and evaluation to [MSDN](http://msdn.microsoft.com/subscriptions/downloads/default.aspx?PV=42:178) and [TechNet](http://technet.microsoft.com/subscriptions/downloads/default.aspx?PV=42:178) subscribers in accordance with MDSN and TechNet agreements. + +**Download MDOP** +MDOP subscribers can download the software at the [Microsoft Volume Licensing website (MVLS)](http://go.microsoft.com/fwlink/p/?LinkId=166331). + +**Purchase MDOP** +Visit the enterprise [Purchase Windows Enterprise Licensing](http://www.microsoft.com/windows/enterprise/how-to-buy.aspx) website to find out how to purchase MDOP for your business. + +  + +  + + + + + From 4fb823c5a56953793a2a247a2832ae772c128f3e Mon Sep 17 00:00:00 2001 From: Xiaokai He Date: Wed, 11 May 2016 11:42:54 -0700 Subject: [PATCH 06/11] update the sample files to prevent build warnings. --- education/TOC.md | 22 +----- education/index.md | 181 +-------------------------------------------- 2 files changed, 3 insertions(+), 200 deletions(-) diff --git a/education/TOC.md b/education/TOC.md index 56e5ab8cd5..03831bb03d 100644 --- a/education/TOC.md +++ b/education/TOC.md @@ -1,21 +1 @@ -# [Microsoft Desktop Optimization Pack](index.md) -## [Advanced Group Policy Management](agpm/) -## [Application Virtualization]() -### [Application Virtualization 5](appv-v5/) -### [Application Virtualization 4](appv-v4/) -### [SoftGrid Application Virtualization](softgrid-application-virtualization.md) -## [Diagnostics and Recovery Toolset]() -### [Diagnostics and Recovery Toolset 10](dart-v10/) -### [Diagnostics and Recovery Toolset 8](dart-v8/) -### [Diagnostics and Recovery Toolset 7](dart-v7/) -### [Diagnostics and Recovery Toolset 6.5](dart-v65.md) -## [Microsoft Bitlocker Administration and Monitoring]() -### [Microsoft Bitlocker Administration and Monitoring 2.5](mbam-v25/) -### [Microsoft Bitlocker Administration and Monitoring 2](mbam-v2/) -### [Microsoft Bitlocker Administration and Monitoring 1](mbam-v1/) -## [Microsoft Enterprise Desktop Virtualization]() -### [Microsoft Enterprise Desktop Virtualization 2](medv-v2/) -## [User Experience Virtualization]() -### [User Experience Virtualization 2](uev-v2/) -### [User Experience Virtualization 1](uev-v1/) -## [MDOP Solutions and Scenarios](solutions/) \ No newline at end of file +# [Education](index.md) diff --git a/education/index.md b/education/index.md index 4632622c96..8d6c416db1 100644 --- a/education/index.md +++ b/education/index.md @@ -1,182 +1,5 @@ --- -title: MDOP Information Experience -description: MDOP Information Experience -ms.assetid: 12b8ab56-3267-450d-bb22-1c7e44cb8e52 -author: jamiejdt +title: Education Overview --- -# MDOP Information Experience - - -The Microsoft Desktop Optimization Pack (MDOP) is a portfolio of technologies available as a subscription for Software Assurance customers. MDOP helps to improve compatibility and management, reduce support costs, improve asset management, and improve policy control. - -The MDOP Information Experience provides product documentation, videos, blogs, and other resources to help users implement and optimize their experience with the MDOP technologies. You can learn about updates and events by following us on [Facebook](http://go.microsoft.com/fwlink/p/?LinkId=242445) or [Twitter](http://go.microsoft.com/fwlink/p/?LinkId=242447). - -## MDOP Documentation Links - - -The following table provides links to the product documentation for the MDOP products by version. - - ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Microsoft Advanced Group Policy Management (AGPM) extends the capabilities of the Group Policy Management Console (GPMC) to provide change control and improved management.

-

AGPM 4.0 SP3 – Windows 10, Windows 8.1, Windows 8, Windows 7, Windows Vista SP1, Windows Server 2012, Windows Server 2012 R2, Windows Server 2008, Windows Server 2008 R2

-

AGPM 4.0 SP2 - Windows 8.1, Windows 8, Windows 7, Windows Vista SP1, Windows Server 2012, Windows Server 2008, Windows Server 2008 R2

-

AGPM 4.0 SP1 - Windows 8, Windows 7, Windows Vista SP1, Windows Server 2012, Windows Server 2008, Windows Server 2008 R2

-

AGPM 4.0 - Windows Vista SP1, Windows 7, Windows Server 2008, Windows Server 2008 R2

-

AGPM 3.0- Windows Vista SP1, Windows Server 2008

-

AGPM 2.5 - Windows Vista, Windows Server 2003

[Overview of Microsoft Advanced Group Policy Management](http://go.microsoft.com/fwlink/p/?LinkId=232980)(http://go.microsoft.com/fwlink/p/?LinkId=232980)

-

[AGPM 4.0 SP3](https://technet.microsoft.com/library/mt346468.aspx) (https://technet.microsoft.com/library/mt346468.aspx)

-

[AGPM 4.0 SP2](http://go.microsoft.com/fwlink/p/?LinkId=325035) (http://go.microsoft.com/fwlink/p/?LinkId=325035)

-

[AGPM 4.0 SP1](http://go.microsoft.com/fwlink/p/?LinkId=286715) (http://go.microsoft.com/fwlink/p/?LinkId=286715)

-

[AGPM 4.0](http://go.microsoft.com/fwlink/p/?LinkId=232964) (http://go.microsoft.com/fwlink/p/?LinkId=232964)

-

[AGPM 3.0](http://go.microsoft.com/fwlink/p/?LinkId=232967) (http://go.microsoft.com/fwlink/p/?LinkId=232967)

-

[AGPM 2.5](http://go.microsoft.com/fwlink/p/?LinkId=232969) (http://go.microsoft.com/fwlink/p/?LinkId=232969)

-

[AGPM Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=232275) (http://go.microsoft.com/fwlink/p/?LinkId=232275)

Microsoft Application Virtualization (App-V) lets you make applications available to end user computers without installing the applications directly on those computers.

[Microsoft Application Virtualization 5.1 Administrator's Guide](appv-v5/microsoft-application-virtualization-51-administrators-guide.md)

-

[About App-V 5.0 SP3](appv-v5/about-app-v-50-sp3.md)

-

[About App-V 5.0 SP2](appv-v5/about-app-v-50-sp2.md)

-

[About App-V 5.0 SP1](appv-v5/about-app-v-50-sp1.md)

-

[Microsoft Application Virtualization 5.0 Administrator's Guide](appv-v5/microsoft-application-virtualization-50-administrators-guide.md)

-

[About Microsoft Application Virtualization 4.6 SP3](appv-v4/about-microsoft-application-virtualization-46-sp3.md)

-

[About Microsoft Application Virtualization 4.6 SP2](appv-v4/about-microsoft-application-virtualization-46-sp2.md)

-

[About Microsoft Application Virtualization 4.6 SP1](appv-v4/about-microsoft-application-virtualization-46-sp1.md)

-

[About Microsoft Application Virtualization 4.6](appv-v4/about-microsoft-application-virtualization-46.md)

-

[About Microsoft Application Virtualization 4.5](appv-v4/about-microsoft-application-virtualization-45.md)

-

[SoftGrid](http://go.microsoft.com/fwlink/p/?LinkId=232981) (http://go.microsoft.com/fwlink/p/?LinkId=232981)

-

[App-V Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=231902) (http://go.microsoft.com/fwlink/p/?LinkId=231902)

-

[App-V 5.0 eBooks](http://go.microsoft.com/fwlink/p/?LinkId=309570) (http://go.microsoft.com/fwlink/p/?LinkId=309570)

Microsoft BitLocker Administration and Monitoring (MBAM) provides an administrative interface to enterprise-wide BitLocker drive encryption.

[Microsoft BitLocker Administration and Monitoring 2.5](mbam-v25/index.md)

-

[MBAM 2.5 Video Demonstration: Deploying MBAM 2.5](http://go.microsoft.com/fwlink/?LinkId=518206) (http://go.microsoft.com/fwlink/?LinkId=518206)

-

[About MBAM 2.5 SP1](mbam-v25/about-mbam-25-sp1.md)

-

[About MBAM 2.0 SP1](mbam-v2/about-mbam-20-sp1.md)

-

[Microsoft BitLocker Administration and Monitoring 2 Administrator's Guide](mbam-v2/index.md)

-

[Microsoft BitLocker Administration and Monitoring 1 Administrator's Guide](mbam-v1/index.md)

-

[MBAM Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=231905) (http://go.microsoft.com/fwlink/p/?LinkId=231905)

-

[MBAM 1.0 eBooks](http://go.microsoft.com/fwlink/p/?LinkId=309571) (http://go.microsoft.com/fwlink/p/?LinkId=309571)

Microsoft Diagnostics and Recovery Toolset (DaRT) helps troubleshoot and repair Windows-based computers.

-

DaRT 10 - Windows 10

-

DaRT 8.1 - Windows 8.1, Windows Server 2012 R2

-

DaRT 8.0 SP1 - Windows 8, Windows Server 2012

-

DaRT 8.0 - Windows 8, Windows Server 2012

-

DaRT 7.0 - Windows 7, Windows Server 2008 R2

-

DaRT 6.5 - Windows 7, Windows Server 2008 R2

-

DaRT 6.0 - Windows Vista, Windows Server 2008

-

DaRT 5.0 - Windows 2000, Windows XP, Windows Server 2003

[Diagnostics and Recovery Toolset 10](dart-v10/index.md)

-

[About DaRT 8.1](dart-v8/about-dart-81.md)

-

[About DaRT 8.0 SP1](dart-v8/about-dart-80-sp1.md)

-

[Diagnostics and Recovery Toolset 8 Administrator's Guide](dart-v8/index.md)

-

[Diagnostics and Recovery Toolset 7 Administrator's Guide](dart-v7/index.md)

-

[DaRT 6.5](http://go.microsoft.com/fwlink/p/?LinkId=232983) (http://go.microsoft.com/fwlink/p/?LinkId=232983)

-

[DaRT Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=232274) (http://go.microsoft.com/fwlink/p/?LinkId=232274)

-

[DaRT 8.0 eBook](http://go.microsoft.com/fwlink/p/?LinkId=309573) (http://go.microsoft.com/fwlink/p/?LinkId=309573)

-

[DaRT 7.0 eBook](http://go.microsoft.com/fwlink/p/?LinkId=309572) (http://go.microsoft.com/fwlink/p/?LinkId=309572)

Microsoft Desktop Enterprise Monitoring (DEM) monitors and reports enterprise-wide desktop application and system failures.

[DEM 3.5](http://go.microsoft.com/fwlink/p/?LinkId=232985) (http://go.microsoft.com/fwlink/p/?LinkId=232985)

-

[DEM Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=232276) (http://go.microsoft.com/fwlink/p/?LinkId=232276)

Microsoft Enterprise Desktop Virtualization (MED-V) uses Microsoft Virtual PC to provide an enterprise solution for desktop virtualization.

-

MED-V 2.0 - Windows 7

-

MED-V 1.0 SP1 - Windows 7, Windows Vista, Windows XP

-

MED-V 1.0 - Windows Vista, Windows XP

[Microsoft Enterprise Desktop Virtualization 2.0](medv-v2/index.md)

-

[About MED-V 1.0 SP1](medv-v1/about-med-v-10-sp1.md)

-

[Microsoft Enterprise Desktop Virtualization 1.0](medv-v1/index.md)

-

[MED-V Whitepapers on the Microsoft Download Center](http://go.microsoft.com/fwlink/p/?LinkId=231903) (http://go.microsoft.com/fwlink/p/?LinkId=231903)

Microsoft User Experience Virtualization (UE-V) captures settings to apply to computers accessed by the user including desktop computers, laptop computers, and VDI sessions.

[Microsoft User Experience Virtualization (UE-V) 2.x](uev-v2/index.md)

-

[What's New in UE-V 2.1 SP1](uev-v2/whats-new-in-ue-v-21-sp1uevv21-sp1.md)

-

[What's New in UE-V 2.1](uev-v2/whats-new-in-ue-v-21-new-uevv2.md)

-

[What's New in UE-V 2.0](uev-v2/whats-new-in-ue-v-20-new-uevv2.md)

-

[About User Experience Virtualization 1.0 SP1](uev-v1/about-user-experience-virtualization-10-sp1.md)

-

[Microsoft User Experience Virtualization (UE-V) 1.0](uev-v1/index.md)

-

[UE-V 1.0 eBooks](http://go.microsoft.com/fwlink/p/?LinkId=309574) (http://go.microsoft.com/fwlink/p/?LinkId=309574)

[MDOP Solutions and Scenarios](solutions/index.md)

[Virtualizing Microsoft Office 2013 for Application Virtualization (App-V) 5.0](solutions/virtualizing-microsoft-office-2013-for-application-virtualization--app-v--50-solutions.md)

-

[Virtualizing Microsoft Office 2010 for Application Virtualization (App-V) 5.0](solutions/virtualizing-microsoft-office-2010-for-application-virtualization--app-v--50-solutions.md)

-

[Creating App-V 4.5 Databases Using SQL Scripting](solutions/creating-app-v-45-databases-using-sql-scripting.md)

-

[Application Publishing and Client Interaction for App-V 5](solutions/application-publishing-and-client-interaction-for-app-v-5-solutions.md)

-

[How to Download and Deploy MDOP Group Policy (.admx) Templates](solutions/how-to-download-and-deploy-mdop-group-policy--admx--templates.md)

- -  - -## Supplemental MDOP Product Guidance - - -In addition to the product documentation available online, supplemental product guidance such as informational videos and virtual labs are available for most MDOP products. - - ---- - - - - - - - - - - - - - - - - - - -

MDOP Videos

For a list of available MDOP videos, go to [Microsoft Desktop Optimization Pack Technologies Videos](http://go.microsoft.com/fwlink/p/?LinkId=234275) (http://go.microsoft.com/fwlink/p/?LinkId=234275).

MDOP Virtual Labs

For a list of available MDOP virtual labs, go to [Microsoft Desktop Optimization Pack (MDOP) Virtual Labs](http://go.microsoft.com/fwlink/p/?LinkId=234276) (http://go.microsoft.com/fwlink/p/?LinkId=234276).

MDOP TechCenter

For technical whitepapers, evaluation materials, blogs, and additional MDOP resources, go to [MDOP TechCenter](http://go.microsoft.com/fwlink/p/?LinkId=225286) (http://go.microsoft.com/fwlink/p/?LinkId=225286)

-

MDOP Forums

Join in the MDOP community where you can ask and answer questions at the [MDOP TechNet Forum](http://go.microsoft.com/fwlink/p/?LinkId=286973) (http://go.microsoft.com/fwlink/p/?LinkId=286973).

- -  - -## How to Get MDOP - - -MDOP is a suite of products that can help streamline desktop deployment, management, and support across the enterprise. MDOP is available as an additional subscription for Software Assurance customers. - -**Evaluate MDOP** -MDOP is also available for test and evaluation to [MSDN](http://msdn.microsoft.com/subscriptions/downloads/default.aspx?PV=42:178) and [TechNet](http://technet.microsoft.com/subscriptions/downloads/default.aspx?PV=42:178) subscribers in accordance with MDSN and TechNet agreements. - -**Download MDOP** -MDOP subscribers can download the software at the [Microsoft Volume Licensing website (MVLS)](http://go.microsoft.com/fwlink/p/?LinkId=166331). - -**Purchase MDOP** -Visit the enterprise [Purchase Windows Enterprise Licensing](http://www.microsoft.com/windows/enterprise/how-to-buy.aspx) website to find out how to purchase MDOP for your business. - -  - -  - - - - - +# Education Overview \ No newline at end of file From 111e5b9ccd49ac4352c0af02e140b26061323608 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Wed, 11 May 2016 12:45:53 -0700 Subject: [PATCH 07/11] Fixed wrong fwlink --- .../ie11-deploy-guide/out-of-date-activex-control-blocking.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md b/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md index 6f06b885ef..d199472eaa 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md +++ b/browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md @@ -87,7 +87,7 @@ IE opens the app’s website. IE uses Microsoft’s 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 Microsoft’s 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) **Security Note:**
Although we strongly recommend against it, if you don’t want your computer to automatically download the updated version list from Microsoft, run the following command from a command prompt: From fa187e10a9e6110acc4dd61138f574f15c2cbb51 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Wed, 11 May 2016 13:16:04 -0700 Subject: [PATCH 08/11] removed placeholder files to put into a new branch for now --- education/TOC.md | 1 - education/index.md | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 education/TOC.md delete mode 100644 education/index.md diff --git a/education/TOC.md b/education/TOC.md deleted file mode 100644 index 03831bb03d..0000000000 --- a/education/TOC.md +++ /dev/null @@ -1 +0,0 @@ -# [Education](index.md) diff --git a/education/index.md b/education/index.md deleted file mode 100644 index 8d6c416db1..0000000000 --- a/education/index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Education Overview ---- - -# Education Overview \ No newline at end of file From fe6205bbad23b43fbca92c16fbed5cdfbeb5261a Mon Sep 17 00:00:00 2001 From: saldana Date: Wed, 11 May 2016 20:26:42 -0700 Subject: [PATCH 09/11] updated destination --- education/docfx.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/education/docfx.json b/education/docfx.json index 85ad44817c..cc09ff86a7 100644 --- a/education/docfx.json +++ b/education/docfx.json @@ -19,6 +19,6 @@ "externalReference": [ ], "template": "op.html", - "dest": "edu" + "dest": "education" } -} \ No newline at end of file +} From 42160e1455e756b4c10557c9639ad4d869370b99 Mon Sep 17 00:00:00 2001 From: saldana Date: Wed, 11 May 2016 22:06:02 -0700 Subject: [PATCH 10/11] Create index.md --- education/index.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 education/index.md diff --git a/education/index.md b/education/index.md new file mode 100644 index 0000000000..0bd9ced4cc --- /dev/null +++ b/education/index.md @@ -0,0 +1 @@ +#OP Testing file From 3dce608554790f8233e997e562e566de2b3ff62b Mon Sep 17 00:00:00 2001 From: LizRoss Date: Thu, 12 May 2016 07:25:42 -0700 Subject: [PATCH 11/11] Updated to add about removing text for deprecated feature --- .../manage/change-history-for-manage-and-update-windows-10.md | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md index 81182141c2..6aa0112b22 100644 --- a/windows/manage/change-history-for-manage-and-update-windows-10.md +++ b/windows/manage/change-history-for-manage-and-update-windows-10.md @@ -16,6 +16,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in | New or changed topic | Description | | ---|---| +|[Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) |Removed info about sharing wi-fi network access with contacts, since it's been deprecated. | | [Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Corrected script for setting a custom shell using Shell Launcher | | [Configure Windows 10 devices to stop data flow to Microsoft](configure-windows-10-devices-to-stop-data-flow-to-microsoft.md) | Added section on how to turn off Live Tiles | | [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md) | New telemetry content |