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

This commit is contained in:
jdeckerMS
2017-04-25 14:33:37 -07:00
4 changed files with 414 additions and 428 deletions

View File

@ -231,20 +231,6 @@
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows",
"build_source_folder": "windows",
"build_output_subfolder": "windows",
"locale": "en-us",
"monikers": [],
"open_to_public_contributors": true,
"type_mapping": {
"Conceptual": "Content"
},
"build_entry_point": "docs",
"template_folder": "_themes",
"version": 0
},
{
"docset_name": "windows-hub",
"build_source_folder": "windows/hub",

View File

@ -122,7 +122,7 @@
},
{
"source_path": "windows/manage/waas-manage-updates-wufb.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": true
},
{
@ -627,7 +627,7 @@
},
{
"source_path": "windows/manage/introduction-to-windows-10-servicing.md",
"redirect_url": "/itpro/windows/deployment/update/index",
"redirect_url": "/windows/deployment/update/index",
"redirect_document_id": true
},
{
@ -872,7 +872,7 @@
},
{
"source_path": "windows/plan/integration-with-management-solutions-.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": false
},
{
@ -952,7 +952,7 @@
},
{
"source_path": "windows/plan/setup-and-deployment.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": false
},
{
@ -1037,7 +1037,7 @@
},
{
"source_path": "windows/plan/windows-update-for-business.md",
"redirect_url": "/itpro/windows/update/waas-manage-updates-wufb",
"redirect_url": "/windows/deployment/update/waas-manage-updates-wufb",
"redirect_document_id": false
},
{

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:
- **<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.
@ -55,7 +55,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows</Name>
<AppName>Skype for Windows</AppName>
<InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -64,7 +64,7 @@ Sequencing multiple apps at the same time requires that you create a **ConfigFil
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Power BI</Name>
<AppName>Power BI</AppName>
<InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<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:
- **&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.
@ -115,7 +115,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows</Name>
<AppName>Skype for Windows</AppName>
<InstallerFolder>D:\Install\New\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<TimeoutInMinutes>20</TimeoutInMinutes>
@ -123,7 +123,7 @@ Sequencing multipe apps at the same time requires that you create a **ConfigFIle
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Power BI</Name>
<AppName>Power BI</AppName>
<InstallerFolder>D:\Install\New\MicrosoftPowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<TimeoutInMinutes>20</TimeoutInMinutes>

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:
- **&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.
@ -50,7 +50,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows Update</Name>
<AppName>Skype for Windows Update</AppName>
<InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -60,7 +60,7 @@ Updating multiple apps at the same time requires that you create a **ConfigFile*
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Microsoft Power BI Update</Name>
<AppName>Microsoft Power BI Update</AppName>
<InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<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:
- **&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.
@ -115,7 +115,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
<?xml version="1.0"?>
<Applications>
<Application>
<Name>Skype for Windows Update</Name>
<AppName>Skype for Windows Update</AppName>
<InstallerFolder>D:\Install\Update\SkypeforWindows</InstallerFolder>
<Installer>SkypeSetup.exe</Installer>
<InstallerOptions>/S</InstallerOptions>
@ -125,7 +125,7 @@ Updating multipe apps at the same time requires that you create a **ConfigFile**
<Enabled>True</Enabled>
</Application>
<Application>
<Name>Microsoft Power BI Update</Name>
<AppName>Microsoft Power BI Update</AppName>
<InstallerFolder>D:\Install\Update\PowerBI</InstallerFolder>
<Installer>PBIDesktop.msi</Installer>
<InstallerOptions>/S</InstallerOptions>