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

This commit is contained in:
LizRoss 2016-10-14 10:33:15 -07:00
commit fc32e60fd5

View File

@ -16,7 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md
| New or changed topic | Description | | New or changed topic | Description |
| --- | --- | | --- | --- |
|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls. | |[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls.|
|[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New | |[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New |
|[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic | |[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic |