Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox'

This commit is contained in:
jdeckerMS 2017-01-20 13:32:12 -08:00
commit 8bcb81ea0f
5 changed files with 15 additions and 9 deletions

3
windows/manage/.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,3 @@
// Place your settings in this file to overwrite default and user settings.
{
}

View File

@ -21,6 +21,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
| [Cortana integration in your business or enterprise](cortana-at-work-overview.md) | New |
| [Start layout XML for desktop editions of Windows 10](start-layout-xml-desktop.md) | New (previously published in Hardware Dev Center on MSDN) |
| [Start layout XML for mobile editions of Windows 10](start-layout-xml-mobile.md) | New (previously published in Hardware Dev Center on MSDN) |
| [Quick guide to Windows as a service](waas-quick-start.md) | Added video that explains how Windows as a service works. |

View File

@ -166,12 +166,10 @@ You can use the **start:DesktopApplicationTile** tag to pin a Windows desktop ap
Column="4"/>
```
You must set the **DesktopApplicationLinkPath** attribute to the .lnk file that points to the Windows desktop application. The path also supports environment variables.
If you are pointing to a third-party Windows desktop application, you must put the .lnk file in a legacy Start Menu directory before first boot; for example, "%APPDATA%\Microsoft\Windows\Start Menu\Programs\" or the all users profile "%ALLUSERSPROFILE%\Microsoft\Windows\Start Menu\Programs\".
- By using the application's application user model ID, if this is known. If the Windows desktop application doesn't have one, use the shortcut link option.
To pin a Windows desktop application through this method, you must set the **DesktopApplicationID** attribute to the application user model ID that's associated with the corresponding app.

View File

@ -52,7 +52,9 @@ Additional technologies such as BranchCache and Delivery Optimization, both peer
See [Build deployment rings for Windows 10 updates](waas-deployment-rings-windows-10-updates.md) and [Optimize update delivery for Windows 10 updates](waas-optimize-windows-10-updates.md) for more information.
## Video: An overview of Windows as a service
<iframe width="560" height="315" src="https://www.youtube.com/embed/MLc4-Suv0LU" frameborder="0" allowfullscreen></iframe>
## Related topics

View File

@ -23,6 +23,8 @@ Windows as a service provides a new way to think about building, deploying, and
>[!TIP]
>See [Windows 10 update history](https://support.microsoft.com/help/12387/windows-10-update-history) for details about each Windows 10 update released to date.
## In this section
| Topic | Description|