deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-15 10:23:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

conflicts fix

Browse Source
This commit is contained in:
Greg Lindsay
2019-06-10 11:56:55 -07:00
parent f0e0ae354f a081d2b73c
commit 7fc3d8b738
2150 changed files with 30048 additions and 29735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
windows/client-management/mdm/implement-server-side-mobile-application-management.md
View File

@ -34,10 +34,10 @@ To make applications WIP-aware, app developers need to include the following dat
``` syntax
// Mark this binary as Allowed for WIP (EDP) purpose 
    MICROSOFTEDPAUTOPROTECTIONALLOWEDAPPINFO EDPAUTOPROTECTIONALLOWEDAPPINFOID
     BEGIN
         0x0001
     END 
MICROSOFTEDPAUTOPROTECTIONALLOWEDAPPINFO EDPAUTOPROTECTIONALLOWEDAPPINFOID
BEGIN
0x0001
END 
```
## Configuring an Azure AD tenant for MAM enrollment
@ -61,13 +61,13 @@ Here is an example provisioning XML for MAM enrollment.
``` syntax
<wap-provisioningdoc version="1.1">
  <characteristic type="APPLICATION">
    <parm name="APPID" value="w7"/>
    <parm name="PROVIDER-ID" value="MAM SyncML Server"/>
    <parm name="NAME" value="mddprov account"/>
    <parm name="ADDR" value="http://localhost:88"/>
    <parm name="DEFAULTENCODING" value="application/vnd.syncml.dm+xml" />
  </characteristic>
<characteristic type="APPLICATION">
<parm name="APPID" value="w7"/>
<parm name="PROVIDER-ID" value="MAM SyncML Server"/>
<parm name="NAME" value="mddprov account"/>
<parm name="ADDR" value="http://localhost:88"/>
<parm name="DEFAULTENCODING" value="application/vnd.syncml.dm+xml" />
</characteristic>
</wap-provisioningdoc>
```
@ -151,20 +151,20 @@ We have updated Skype for Business to work with MAM. The following table explain
</thead>
<tbody>
<tr>
<td>[Current channel](https://technet.microsoft.com/library/mt455210.aspx#BKMK_CB)</td>
<td><a href="https://technet.microsoft.com/library/mt455210.aspx#BKMK_CB" data-raw-source="[Current channel](https://technet.microsoft.com/library/mt455210.aspx#BKMK_CB)">Current channel</a></td>
<td>Provide pilot users and application compatibility testers the opportunity to test the next Deferred Channel. </td>
<td>March 9 2017</td>
<td><p>Visio Pro for Office 365</p>
<p>Project Online Desktop Client</p>
<p>Project Desktop Client</p>
<p>Office 365 Business (the version of Office that comes with some Office 365 plans, such as Business Premium.)</p></td>
</tr>
<tr>
<td>[Deferred channel](https://technet.microsoft.com/library/mt455210.aspx#BKMK_CBB)</td>
<td><a href="https://technet.microsoft.com/library/mt455210.aspx#BKMK_CBB" data-raw-source="[Deferred channel](https://technet.microsoft.com/library/mt455210.aspx#BKMK_CBB)">Deferred channel</a></td>
<td>Provide users with new features of Office only a few times a year.</td>
<td>October 10 2017</td>
<td>Office 365 ProPlus</td>
</tr><tr>
<td>[First release for deferred channel](https://technet.microsoft.com/library/mt455210.aspx#BKMK_FRCBB)</td>
<td><a href="https://technet.microsoft.com/library/mt455210.aspx#BKMK_FRCBB" data-raw-source="[First release for deferred channel](https://technet.microsoft.com/library/mt455210.aspx#BKMK_FRCBB)">First release for deferred channel</a></td>
<td>Provide pilot users and application compatibility testers the opportunity to test the next Deferred Channel. </td>
<td>June 13 2017</td>
<td></td>