deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-13 13:57:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
LizRoss 2017-04-25 11:35:32 -07:00
commit daddb1c69d
7 changed files with 414 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

808
.openpublishing.publish.config.json
View File

@ -1,412 +1,398 @@
{ {
"build_entry_point": "", "build_entry_point": "",
"need_generate_pdf": false, "need_generate_pdf": false,
"need_generate_intellisense": false, "need_generate_intellisense": false,
"docsets_to_publish": [ "docsets_to_publish": [
{ {
"docset_name": "education", "docset_name": "education",
"build_source_folder": "education", "build_source_folder": "education",
"build_output_subfolder": "education", "build_output_subfolder": "education",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "internet-explorer", "docset_name": "internet-explorer",
"build_source_folder": "browsers/internet-explorer", "build_source_folder": "browsers/internet-explorer",
"build_output_subfolder": "browsers/internet-explorer", "build_output_subfolder": "browsers/internet-explorer",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "itpro-hololens", "docset_name": "itpro-hololens",
"build_source_folder": "devices/hololens", "build_source_folder": "devices/hololens",
"build_output_subfolder": "devices/hololens", "build_output_subfolder": "devices/hololens",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "mdop", "docset_name": "mdop",
"build_source_folder": "mdop", "build_source_folder": "mdop",
"build_output_subfolder": "mdop", "build_output_subfolder": "mdop",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "microsoft-edge", "docset_name": "microsoft-edge",
"build_source_folder": "browsers/edge", "build_source_folder": "browsers/edge",
"build_output_subfolder": "browsers/edge", "build_output_subfolder": "browsers/edge",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "smb", "docset_name": "smb",
"build_source_folder": "smb", "build_source_folder": "smb",
"build_output_subfolder": "smb", "build_output_subfolder": "smb",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "store-for-business", "docset_name": "store-for-business",
"build_source_folder": "store-for-business", "build_source_folder": "store-for-business",
"build_output_subfolder": "store-for-business", "build_output_subfolder": "store-for-business",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "surface", "docset_name": "surface",
"build_source_folder": "devices/surface", "build_source_folder": "devices/surface",
"build_output_subfolder": "devices/surface", "build_output_subfolder": "devices/surface",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "surface-hub", "docset_name": "surface-hub",
"build_source_folder": "devices/surface-hub", "build_source_folder": "devices/surface-hub",
"build_output_subfolder": "devices/surface-hub", "build_output_subfolder": "devices/surface-hub",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "win-access-protection", "docset_name": "win-access-protection",
"build_source_folder": "windows/access-protection", "build_source_folder": "windows/access-protection",
"build_output_subfolder": "win-access-protection", "build_output_subfolder": "win-access-protection",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "win-app-management", "docset_name": "win-app-management",
"build_source_folder": "windows/application-management", "build_source_folder": "windows/application-management",
"build_output_subfolder": "win-app-management", "build_output_subfolder": "win-app-management",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "win-client-management", "docset_name": "win-client-management",
"build_source_folder": "windows/client-management", "build_source_folder": "windows/client-management",
"build_output_subfolder": "win-client-management", "build_output_subfolder": "win-client-management",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "win-configuration", "docset_name": "win-configuration",
"build_source_folder": "windows/configuration", "build_source_folder": "windows/configuration",
"build_output_subfolder": "win-configuration", "build_output_subfolder": "win-configuration",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "win-development", "docset_name": "win-development",
"build_source_folder": "windows/deployment", "build_source_folder": "windows/deployment",
"build_output_subfolder": "win-development", "build_output_subfolder": "win-development",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "win-device-security", "docset_name": "win-device-security",
"build_source_folder": "windows/device-security", "build_source_folder": "windows/device-security",
"build_output_subfolder": "win-device-security", "build_output_subfolder": "win-device-security",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
"docset_name": "windows", "docset_name": "windows-hub",
"build_source_folder": "windows", "build_source_folder": "windows/hub",
"build_output_subfolder": "windows", "build_output_subfolder": "windows-hub",
"locale": "en-us", "locale": "en-us",
"monikers": [], "monikers": [],
"open_to_public_contributors": true, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "windows-hub", },
"build_source_folder": "windows/hub", {
"build_output_subfolder": "windows-hub", "docset_name": "win-threat-protection",
"locale": "en-us", "build_source_folder": "windows/threat-protection",
"monikers": [], "build_output_subfolder": "win-threat-protection",
"open_to_public_contributors": true, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": true,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "win-threat-protection", },
"build_source_folder": "windows/threat-protection", {
"build_output_subfolder": "win-threat-protection", "docset_name": "win-whats-new",
"locale": "en-us", "build_source_folder": "windows/whats-new",
"monikers": [], "build_output_subfolder": "win-whats-new",
"open_to_public_contributors": true, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": true,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "win-whats-new", },
"build_source_folder": "windows/whats-new", {
"build_output_subfolder": "win-whats-new", "docset_name": "keep-secure",
"locale": "en-us", "build_source_folder": "windows/keep-secure",
"monikers": [], "build_output_subfolder": "keep-secure",
"open_to_public_contributors": true, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": false,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "keep-secure", },
"build_source_folder": "windows/keep-secure", {
"build_output_subfolder": "keep-secure", "docset_name": "windows-manage",
"locale": "en-us", "build_source_folder": "windows/manage",
"monikers": [], "build_output_subfolder": "windows-manage",
"open_to_public_contributors": false, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": false,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "windows-manage", },
"build_source_folder": "windows/manage", {
"build_output_subfolder": "windows-manage", "docset_name": "windows-plan",
"locale": "en-us", "build_source_folder": "windows/plan",
"monikers": [], "build_output_subfolder": "windows-plan",
"open_to_public_contributors": false, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": false,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "windows-plan", },
"build_source_folder": "windows/plan", {
"build_output_subfolder": "windows-plan", "docset_name": "windows-update",
"locale": "en-us", "build_source_folder": "windows/update",
"monikers": [], "build_output_subfolder": "windows-update",
"open_to_public_contributors": false, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": false,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "windows-update", },
"build_source_folder": "windows/update", {
"build_output_subfolder": "windows-update", "docset_name": "windows-deploy",
"locale": "en-us", "build_source_folder": "windows/deploy",
"monikers": [], "build_output_subfolder": "windows-deploy",
"open_to_public_contributors": false, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": false,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "windows-deploy", },
"build_source_folder": "windows/deploy", {
"build_output_subfolder": "windows-deploy", "docset_name": "windows-configure",
"locale": "en-us", "build_source_folder": "windows/configure",
"monikers": [], "build_output_subfolder": "windows-configure",
"open_to_public_contributors": false, "locale": "en-us",
"type_mapping": { "monikers": [],
"Conceptual": "Content", "open_to_public_contributors": false,
"ManagedReference": "Content", "type_mapping": {
"RestApi": "Content" "Conceptual": "Content",
}, "ManagedReference": "Content",
"build_entry_point": "docs", "RestApi": "Content"
"template_folder": "_themes", },
"version": 0 "build_entry_point": "docs",
}, "template_folder": "_themes",
{ "version": 0
"docset_name": "windows-configure", }
"build_source_folder": "windows/configure", ],
"build_output_subfolder": "windows-configure", "notification_subscribers": [
"locale": "en-us", "brianlic@microsoft.com"
"monikers": [], ],
"open_to_public_contributors": false, "branches_to_filter": [
"type_mapping": { ""
"Conceptual": "Content", ],
"ManagedReference": "Content", "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs",
"RestApi": "Content" "git_repository_branch_open_to_public_contributors": "master",
}, "skip_source_output_uploading": false,
"build_entry_point": "docs", "need_preview_pull_request": true,
"template_folder": "_themes", "dependent_repositories": [
"version": 0 {
} "path_to_root": "_themes",
], "url": "https://github.com/Microsoft/templates.docs.msft",
"notification_subscribers": [ "branch": "master",
"brianlic@microsoft.com" "branch_mapping": {}
], }
"branches_to_filter": [ ],
"" "need_generate_pdf_url_template": false
],
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs",
"git_repository_branch_open_to_public_contributors": "master",
"skip_source_output_uploading": false,
"need_preview_pull_request": true,
"dependent_repositories": [
{
"path_to_root": "_themes",
"url": "https://github.com/Microsoft/templates.docs.msft",
"branch": "master",
"branch_mapping": {}
}
],
"need_generate_pdf_url_template": false
} }

2
.openpublishing.redirection.json
View File

@ -162,7 +162,7 @@
}, },
{ {
"source_path": "windows/manage/waas-update-windows-10.md", "source_path": "windows/manage/waas-update-windows-10.md",
"redirect_url": "/itpro/windows/deployment/update/index", "redirect_url": "/windows/deployment/update/index",
"redirect_document_id": false "redirect_document_id": false
}, },
{ {

3
mdop/mbam-v25/copying-the-mbam-25-group-policy-templates.md
View File

@ -22,7 +22,8 @@ MDOP Group Policy templates are available for download in a self-extracting, com
**How to download and deploy the MDOP Group Policy templates** **How to download and deploy the MDOP Group Policy templates**
1. Download the MDOP Group Policy templates from [How to Get MDOP Group Policy (.admx) Templates](https://go.microsoft.com/fwlink/p/?LinkId=393941) . 1. Download the MDOP Group Policy templates from [Microsoft Desktop Optimization Pack Group Policy Administrative Templates
](https://www.microsoft.com/en-us/download/details.aspx?id=54957).
2. Run the downloaded file to extract the template folders. 2. Run the downloaded file to extract the template folders.

12
windows/application-management/app-v/appv-auto-batch-sequencing.md
View File

@ -35,7 +35,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
2. Add the following required XML info for each app: 2. Add the following required XML info for each app:
- **<Name>.** The name of the app you're adding to the package. - **<AppName>.** The name of the app you're adding to the package.
- **<InstallerFolder>.** The file path to the folder with the app installer. - **<InstallerFolder>.** The file path to the folder with the app installer.
@ -55,7 +55,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
<?xml version="1.0"?> <?xml version="1.0"?>
<Applications> <Applications>
<Application> <Application>
<Name>Skype for Windows</Name> <AppName>Skype for Windows</AppName>
<InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder> <InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer> <Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions> <InstallerOptions>/S</InstallerOptions>
@ -64,7 +64,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
<Enabled>True</Enabled> <Enabled>True</Enabled>
</Application> </Application>
<Application> <Application>
<Name>Power BI</Name> <AppName>Power BI</AppName>
<InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder> <InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer> <Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions> <InstallerOptions>/S</InstallerOptions>
@ -97,7 +97,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
2. Add the following required XML info for each app: 2. Add the following required XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package. - **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer. - **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -115,7 +115,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
<?xml version="1.0"?> <?xml version="1.0"?>
<Applications> <Applications>
<Application> <Application>
<Name>Skype for Windows</Name> <AppName>Skype for Windows</AppName>
<InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder> <InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer> <Installer>SkypeSetup.exe</Installer>
<TimeoutInMinutes>20</TimeoutInMinutes> <TimeoutInMinutes>20</TimeoutInMinutes>
@ -123,7 +123,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
<Enabled>True</Enabled> <Enabled>True</Enabled>
</Application> </Application>
<Application> <Application>
<Name>Power BI</Name> <AppName>Power BI</AppName>
<InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder> <InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer> <Installer>PBIDesktop.msi</Installer>
<TimeoutInMinutes>20</TimeoutInMinutes> <TimeoutInMinutes>20</TimeoutInMinutes>

12
windows/application-management/app-v/appv-auto-batch-updating.md
View File

@ -29,7 +29,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
2. Add the following XML info for each app: 2. Add the following XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package. - **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer. - **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -50,7 +50,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
<?xml version="1.0"?> <?xml version="1.0"?>
<Applications> <Applications>
<Application> <Application>
<Name>Skype for Windows Update</Name> <AppName>Skype for Windows Update</AppName>
<InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder> <InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer> <Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions> <InstallerOptions>/S</InstallerOptions>
@ -60,7 +60,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
<Enabled>True</Enabled> <Enabled>True</Enabled>
</Application> </Application>
<Application> <Application>
<Name>Microsoft Power BI Update</Name> <AppName>Microsoft Power BI Update</AppName>
<InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder> <InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer> <Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions> <InstallerOptions>/S</InstallerOptions>
@ -95,7 +95,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
2. Add the following XML info for each app: 2. Add the following XML info for each app:
- **&lt;Name&gt;.** The name of the app you're adding to the package. - **&lt;AppName&gt;.** The name of the app you're adding to the package.
- **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer. - **&lt;InstallerFolder&gt;.** The file path to the folder with the app installer.
@ -115,7 +115,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
<?xml version="1.0"?> <?xml version="1.0"?>
<Applications> <Applications>
<Application> <Application>
<Name>Skype for Windows Update</Name> <AppName>Skype for Windows Update</AppName>
<InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder> <InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer> <Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions> <InstallerOptions>/S</InstallerOptions>
@ -125,7 +125,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
<Enabled>True</Enabled> <Enabled>True</Enabled>
</Application> </Application>
<Application> <Application>
<Name>Microsoft Power BI Update</Name> <AppName>Microsoft Power BI Update</AppName>
<InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder> <InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer> <Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions> <InstallerOptions>/S</InstallerOptions>

2
windows/deployment/planning/change-history-for-plan-for-windows-10-deployment.md
View File

@ -42,7 +42,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
| New or changed topic | Description | | New or changed topic | Description |
|--------------------------------------------------------------------------------------------------------------------------------------------------|-------------| |--------------------------------------------------------------------------------------------------------------------------------------------------|-------------|
|[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.| |[Application Compatibility Toolkit (ACT) Technical Reference](act-technical-reference.md) (multiple topics) |Redirected deprecated content to the [Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-readiness.md) content. Only Standard User Analyzer and Compatibility Administrator continue to be supported.|
| [Windows 10 servicing overview](../update/waas-overview.md) | Content on this page was summarized. Detailed content about servicing branches was moved to the [Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md) page. | | [Windows 10 servicing overview](../update/waas-overview.md) | Content on this page was summarized. Detailed content about servicing branches was moved to the [Windows 10 servicing options](../update/waas-servicing-strategy-windows-10-updates.md) page. |

2
windows/deployment/update/waas-servicing-strategy-windows-10-updates.md
View File

@ -30,7 +30,7 @@ Windows 10 spreads the traditional deployment effort of a Windows upgrade, which
- **Identify excluded PCs.** For some organizations, special-purpose devices such as those used to control factory or medical equipment or run ATMs require a stricter, less frequent feature update cycle than CB or Current Branch for Business (CBB) can offer. For those machines, you must install Windows 10 Enterprise LTSB to avoid feature updates for up to 10 years. Identify these PCs, and separate them from the phased deployment and servicing cycles to help remove confusion for your administrators and ensure that devices are handled correctly. - **Identify excluded PCs.** For some organizations, special-purpose devices such as those used to control factory or medical equipment or run ATMs require a stricter, less frequent feature update cycle than CB or Current Branch for Business (CBB) can offer. For those machines, you must install Windows 10 Enterprise LTSB to avoid feature updates for up to 10 years. Identify these PCs, and separate them from the phased deployment and servicing cycles to help remove confusion for your administrators and ensure that devices are handled correctly.
- **Recruit volunteers.** The purpose of testing a deployment is to receive feedback. One effective way to recruit pilot users is to request volunteers. When doing so, clearly state that you’re looking for feedback rather than people to just “try it out” and that there could be occasional issues involved with accepting feature updates right away. With Windows as a service, the expectation is that there should be few issues, but if an issue does arise, you want testers to let you know as soon as possible. When considering whom to recruit for pilot groups, be sure to include members who provide the broadest set of applications and devices to validate the largest number of apps and devices possible. - **Recruit volunteers.** The purpose of testing a deployment is to receive feedback. One effective way to recruit pilot users is to request volunteers. When doing so, clearly state that you’re looking for feedback rather than people to just “try it out” and that there could be occasional issues involved with accepting feature updates right away. With Windows as a service, the expectation is that there should be few issues, but if an issue does arise, you want testers to let you know as soon as possible. When considering whom to recruit for pilot groups, be sure to include members who provide the broadest set of applications and devices to validate the largest number of apps and devices possible.
- **Choose a servicing tool.** Decide which product you’ll use to manage the Windows updates in your environment. If you’re currently using Windows Server Update Services (WSUS) or System Center Configuration Manager to manage your Windows updates, you can continue using those products to manage Windows 10 updates. Alternatively, you can use Windows Update for Business. In addition to which product you’ll use, consider how you’ll deliver the updates. With Windows 10, multiple peer-to-peer options are available to make update distribution faster. For a comparison of tools, see [Servicing tools](waas-overview.md#servicing-tools). - **Choose a servicing tool.** Decide which product you’ll use to manage the Windows updates in your environment. If you’re currently using Windows Server Update Services (WSUS) or System Center Configuration Manager to manage your Windows updates, you can continue using those products to manage Windows 10 updates. Alternatively, you can use Windows Update for Business. In addition to which product you’ll use, consider how you’ll deliver the updates. With Windows 10, multiple peer-to-peer options are available to make update distribution faster. For a comparison of tools, see [Servicing tools](waas-overview.md#servicing-tools).
- **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-analytics.md). - **Prioritize applications.** First, create an application portfolio. This list should include everything installed in your organization and any webpages your organization hosts. Next, prioritize this list to identify those that are the most business critical. Because the expectation is that application compatibility with Windows 10 will be high, only the most business critical applications should be tested before the pilot phase; everything else can be tested afterwards. For more information about identifying compatibility issues withe applications, see [Manage Windows upgrades with Upgrade Analytics](../upgrade/manage-windows-upgrades-with-upgrade-readiness.md).
>[!NOTE] >[!NOTE]
>This strategy is applicable to approaching an environment in which Windows 10 already exists. For information about how to deploy or upgrade to Windows 10 where another version of Windows exists, see [Plan for Windows 10 deployment](../planning/index.md). >This strategy is applicable to approaching an environment in which Windows 10 already exists. For information about how to deploy or upgrade to Windows 10 where another version of Windows exists, see [Plan for Windows 10 deployment](../planning/index.md).