diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 47d3a0ac90..7d3a0ff26f 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -6,6 +6,26 @@
"redirect_document_id": true
},
{
+"source_path": "windows/security/information-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md",
+"redirect_url": "/windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune.md",
+"redirect_url": "/windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/information-protection/windows-information-protection/deploy-wip-policy-using-intune.md",
+"redirect_url": "/windows/security/information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure",
+"redirect_document_id": true
+},
+{
+"source_path": "windows/security/information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md",
+"redirect_url": "/windows/security/information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure",
+"redirect_document_id": true
+},
+{
"source_path": "windows/security/threat-protection/windows-defender-atp/how-hardware-based-containers-help-protect-windows.md",
"redirect_url": "/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-containers-help-protect-windows",
"redirect_document_id": true
diff --git a/bcs/docfx.json b/bcs/docfx.json
index 16e842d530..2fa639d038 100644
--- a/bcs/docfx.json
+++ b/bcs/docfx.json
@@ -40,6 +40,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "bcs-vsts"
+ "dest": "bcs-vsts",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/browsers/edge/docfx.json b/browsers/edge/docfx.json
index 42532b3fb2..c0761e7192 100644
--- a/browsers/edge/docfx.json
+++ b/browsers/edge/docfx.json
@@ -33,6 +33,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "browsers/edge"
+ "dest": "browsers/edge",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/browsers/internet-explorer/docfx.json b/browsers/internet-explorer/docfx.json
index 323ba3e4bd..0c42ef4158 100644
--- a/browsers/internet-explorer/docfx.json
+++ b/browsers/internet-explorer/docfx.json
@@ -34,6 +34,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "edges/internet-explorer"
+ "dest": "edges/internet-explorer",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/devices/hololens/docfx.json b/devices/hololens/docfx.json
index 7a67485a17..06af992034 100644
--- a/devices/hololens/docfx.json
+++ b/devices/hololens/docfx.json
@@ -48,6 +48,7 @@
"template": [
null
],
- "dest": "devices/hololens"
+ "dest": "devices/hololens",
+ "markdownEngineName": "dfm"
}
}
diff --git a/devices/surface-hub/docfx.json b/devices/surface-hub/docfx.json
index 47f420a4d0..88d3dc2f7e 100644
--- a/devices/surface-hub/docfx.json
+++ b/devices/surface-hub/docfx.json
@@ -36,6 +36,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "devices/surface-hub"
+ "dest": "devices/surface-hub",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/devices/surface/docfx.json b/devices/surface/docfx.json
index 8477cac86f..9bae9c245d 100644
--- a/devices/surface/docfx.json
+++ b/devices/surface/docfx.json
@@ -33,6 +33,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "devices/surface"
+ "dest": "devices/surface",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/education/docfx.json b/education/docfx.json
index 227546b56a..87d94a2065 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -33,6 +33,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "education"
+ "dest": "education",
+ "markdownEngineName": "dfm"
}
}
diff --git a/gdpr/docfx.json b/gdpr/docfx.json
index d426f781dc..2fd5e0e9f9 100644
--- a/gdpr/docfx.json
+++ b/gdpr/docfx.json
@@ -38,6 +38,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "gdpr"
+ "dest": "gdpr",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/mdop/docfx.json b/mdop/docfx.json
index 530722278f..38b354ec49 100644
--- a/mdop/docfx.json
+++ b/mdop/docfx.json
@@ -34,6 +34,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "mdop"
+ "dest": "mdop",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/smb/docfx.json b/smb/docfx.json
index 181bf75fda..56500f0150 100644
--- a/smb/docfx.json
+++ b/smb/docfx.json
@@ -42,6 +42,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "smb"
+ "dest": "smb",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/store-for-business/billing-understand-your-invoice-msfb.md b/store-for-business/billing-understand-your-invoice-msfb.md
index baa42e23a6..d477d66085 100644
--- a/store-for-business/billing-understand-your-invoice-msfb.md
+++ b/store-for-business/billing-understand-your-invoice-msfb.md
@@ -58,7 +58,7 @@ The **Invoice Summary** is on the top of the first page and shows information ab
| P.O. number |An optional purchase order number, assigned by you for tracking |
| Invoice number |A unique, Microsoft-generated invoice number used for tracking purposes |
| Invoice date |Date that the invoice is generated, typically five to 12 days after end of the Billing cycle. You can check your invoice date in billing profile properties.|
-| Payment terms |How you pay for your Microsoft bill. *Net 30 days* means you pay by check or wire transfer within 30 days of the invoice date. |
+| Payment terms |How you pay for your Microsoft bill. *Net 30 days* means you pay by following instructions on your invoice, within 30 days of the invoice date. |
### Understand the billing summary
The **Billing Summary** shows the charges against the billing profile since the previous billing period, any credits that were applied, tax, and the total amount due.
@@ -100,7 +100,7 @@ The total amount due for each service family is calculated by subtracting Azure
| Total | The total amount due for the purchase |
### How to pay
-At the bottom of the invoice, there are instructions for paying your bill. You can pay by check, wire, or online. If you pay online, you can use a credit/debit card or Azure credits, if applicable.
+At the bottom of the invoice, there are instructions for paying your bill. You can pay by wire or online. If you pay online, you can use a credit or debit card, or Azure credits, if applicable.
### Publisher information
If you have third-party services in your bill, the name and address of each publisher is listed at the bottom of your invoice.
diff --git a/store-for-business/docfx.json b/store-for-business/docfx.json
index d739d26b28..e02715ff1f 100644
--- a/store-for-business/docfx.json
+++ b/store-for-business/docfx.json
@@ -49,6 +49,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "store-for-business"
+ "dest": "store-for-business",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/store-for-business/sfb-change-history.md b/store-for-business/sfb-change-history.md
index f4429a667f..eb426098c6 100644
--- a/store-for-business/sfb-change-history.md
+++ b/store-for-business/sfb-change-history.md
@@ -8,16 +8,20 @@ ms.pagetype: store
author: TrudyHa
ms.author: TrudyHa
ms.topic: conceptual
-ms.date: 4/26/2018
+ms.date: 3/2/2019
ms.localizationpriority: medium
---
# Change history for Microsoft Store for Business and Microsoft Store for Education
-**Applies to**
-
-- Windows 10
-- Windows 10 Mobile
+## March 2019
+| New or changed topic | Description |
+| --- | --- |
+| [Understand your Microsoft Customer Agreement invoice](billing-understand-your-invoice-msfb.md) | New topic |
+| [Understand billing profiles](billing-profile.md) | New topic |
+| [Payment methods](payment-methods.md) | New topic |
+| [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) | Update with information on billing accounts. |
+| [Roles and permissions in Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md) | Add info for purchasing roles and permissions. |
## April 2018
| New or changed topic | Description |
diff --git a/windows/application-management/docfx.json b/windows/application-management/docfx.json
index 5c20bbd8a7..8cb7d083a0 100644
--- a/windows/application-management/docfx.json
+++ b/windows/application-management/docfx.json
@@ -47,6 +47,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "win-app-management"
+ "dest": "win-app-management",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/windows/client-management/docfx.json b/windows/client-management/docfx.json
index eab3b9f62e..f68b218456 100644
--- a/windows/client-management/docfx.json
+++ b/windows/client-management/docfx.json
@@ -46,6 +46,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "win-client-management"
+ "dest": "win-client-management",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/windows/configuration/docfx.json b/windows/configuration/docfx.json
index e66228ba49..67eda5ee5a 100644
--- a/windows/configuration/docfx.json
+++ b/windows/configuration/docfx.json
@@ -47,6 +47,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "win-configuration"
+ "dest": "win-configuration",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/windows/deployment/docfx.json b/windows/deployment/docfx.json
index 0b6ae0597d..45f759e8f4 100644
--- a/windows/deployment/docfx.json
+++ b/windows/deployment/docfx.json
@@ -48,6 +48,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "win-development"
+ "dest": "win-development",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/windows/deployment/update/fod-and-lang-packs.md b/windows/deployment/update/fod-and-lang-packs.md
index c2fcc08b95..471cb01382 100644
--- a/windows/deployment/update/fod-and-lang-packs.md
+++ b/windows/deployment/update/fod-and-lang-packs.md
@@ -15,9 +15,9 @@ ms.topic: article
> Applies to: Windows 10
-As of Windows 10 version 1709, you cannot use Windows Server Update Services (WSUS) to host [Features on Demand](https://docs.microsoft.com/windows-hardware/manufacture/desktop/features-on-demand-v2--capabilities) (FOD) and language packs for Windows 10 clients locally. Instead, you can enforce a Group Policy setting that tells the clients to pull them directly from Windows Update. You can also host FOD and language packs on a network share, but starting with Windows 10 version 1809, FOD and language packs can only be installed from Windows Update.
+As of Windows 10 version 1709, you cannot use Windows Server Update Services (WSUS) to host [Features on Demand](https://docs.microsoft.com/windows-hardware/manufacture/desktop/features-on-demand-v2--capabilities) (FOD) and language packs for Windows 10 clients locally. Instead, you can enforce a Group Policy setting that tells the clients to pull them directly from Windows Update. You can also host FOD and language packs on a network share, but starting with Windows 10 version 1809, language packs can only be installed from Windows Update.
-For Windows domain environments running WSUS or SCCM, change the **Specify settings for optional component installation and component repair** policy to enable downloading FOD and language packs from Windows Update. This setting is located in `Computer Configuration\Administrative Templates\System` in the Group Policy Editor.
+For Windows domain environments running WSUS or SCCM, change the **Specify settings for optional component installation and component repair** policy to enable downloading language and FOD packs from Windows Update. This setting is located in `Computer Configuration\Administrative Templates\System` in the Group Policy Editor.
Changing this policy does not affect how other updates are distributed. They continue to come from WSUS or SCCM as you have scheduled them.
diff --git a/windows/docfx.json b/windows/docfx.json
index 9ac35033eb..0e7c823b17 100644
--- a/windows/docfx.json
+++ b/windows/docfx.json
@@ -25,6 +25,7 @@
"externalReference": [
],
"template": "op.html",
- "dest": "windows"
+ "dest": "windows",
+ "markdownEngineName": "dfm"
}
}
diff --git a/windows/hub/docfx.json b/windows/hub/docfx.json
index 8ef6442201..a44aea3b51 100644
--- a/windows/hub/docfx.json
+++ b/windows/hub/docfx.json
@@ -50,6 +50,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "windows-hub"
+ "dest": "windows-hub",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/windows/security/docfx.json b/windows/security/docfx.json
index 394ca15239..018d611769 100644
--- a/windows/security/docfx.json
+++ b/windows/security/docfx.json
@@ -43,6 +43,7 @@
},
"fileMetadata": {},
"template": [],
- "dest": "security"
+ "dest": "security",
+ "markdownEngineName": "dfm"
}
}
\ No newline at end of file
diff --git a/windows/security/information-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md b/windows/security/information-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md
deleted file mode 100644
index 234ef89755..0000000000
--- a/windows/security/information-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md
+++ /dev/null
@@ -1,663 +0,0 @@
----
-title: Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune (Windows 10)
-description: The Azure portal for Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, supporting mobile application management (MAM), to let you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
-ms.prod: w10
-ms.mktglfcycl: explore
-ms.sitesec: library
-ms.pagetype: security
-ms.localizationpriority: medium
-author: justinha
-ms.author: justinha
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: conceptual
-ms.date: 03/05/2019
----
-
-# Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune
-
-**Applies to:**
-
-- Windows 10, version 1703 and later
-- Windows 10 Mobile, version 1703 and later (except Microsoft Azure Rights Management, which is only available on the desktop)
-
-By using Microsoft Intune with Mobile application management (MAM), organizations can take advantage of Azure Active Directory (Azure AD) and the app protection policy feature to keep employees from logging in with personal credentials and accessing corporate data. Additionally, MAM solutions can help your enterprise do the following for mobile apps:
-
-- Configure, update, and deploy mobile apps to employees
-- Control what your employees can do with enterprise data, such as copying, pasting, and saving
-- Keep enterprise data separate from your employee's personal data
-- Remove enterprise data from employee's devices
-- Report on mobile app inventory and track usage
-
-## Alternative steps if you already manage devices with MDM
-
-This topic covers creating a Windows Information Protection (WIP) policy for organizations using a mobile application management (MAM) solution to deploy your WIP policy to Intune apps without device enrollment. If you are already managing devices by using a Mobile Device Management (MDM) solution, see [Create a Windows Information Protection (WIP) with enrollment policy using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md).
-
-If the same user and device are targeted for both MAM-only (without device enrollment) policy and MDM policy, the MDM policy (with device enrollement) will be applied to devices joined to Azure AD. For personal devices that are workplace-joined (that is, added by using **Settings** > **Email & accounts** > **Add a work or school account**), the MAM-only policy will be preferred but it's possible to upgrade the device management to MDM in **Settings**.
-
-Windows Home edition only supports WIP for MAM-only; upgrading to MDM policy on Home edition will revoke WIP-protected data access.
-
-## Prerequisites to using MAM with Windows Information Protection (WIP)
-Before you can create your WIP policy with MAM, you need to [set up your MAM provider](https://docs.microsoft.com/intune-classic/deploy-use/get-ready-to-configure-app-protection-policies-for-windows-10).
-
-Additionally, you must have an [Azure AD Premium license](https://docs.microsoft.com/azure/active-directory/active-directory-licensing-what-is) and be running at least Windows 10, version 1703 on your device.
-
->[!Important]
->WIP doesn't support multi-identity. Only one managed identity can exist at a time.
-
-## Add a WIP policy
-After you’ve set up Intune for your organization, you must create a WIP-specific policy.
-
-**To add a WIP policy**
-1. Open the Azure portal and click the **Intune service** from the sidebar.
-
- The Microsoft Intune Overview blade appears.
-
-2. Click **Client apps**, click **App protection policies**, and then click **Add a policy**.
-
- 
-
-3. In the **Add a policy** blade, fill out the fields:
-
- - **Name.** Type a name (required) for your new policy.
-
- - **Description.** Type an optional description.
-
- - **Platform.** Choose **Windows 10** to create your MAM policy for desktop client devices.
-
- - **Enrollment state.** Choose **Without enrollment** as the enrollment state for your policy.
-
- 
-
- >[!Important]
- >Choosing **Without enrollment** only applies for organizations using MAM. If you're using MDM, see [Create a Windows Information Protection (WIP) policy with MDM using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md).
-
-4. Click **Create**.
-
- The policy is created and appears in the table on the **Client apps - App protection policies** blade.
-
- >[!NOTE]
- >Optionally, you can also add your apps and set your settings from the **Add a policy** blade, but for the purposes of this documentation, we recommend instead that you create the policy first, and then use the subsequent menus that become available.
-
-## Add apps to your Protected apps list
-During the policy-creation process in Intune, you can choose the apps you want to allow, as well as deny, access to your enterprise data through WIP. Apps included in this list can protect data on behalf of the enterprise and are restricted from copying or moving enterprise data to unprotected apps.
-
-The steps to add your apps are based on the type of template being applied. You can add a recommended app, a store app (also known as a Universal Windows Platform (UWP) app), or a signed Windows desktop app. You can also import a list of approved apps or add exempt apps.
-
-In addition, you can create an app deny list related to the policy based on an **action** value. The action can be either **Allow** or **Deny**. When you specify the deny action for an app using the policy, corporate access is denied to the app.
-
->[!Important]
->Enlightened apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, WIP-unaware apps might not respect the corporate network boundary, and WIP-unaware apps will encrypt all files they create or modify. This means that they could encrypt personal data and cause data loss during the revocation process.
Care must be taken to get a support statement from the software provider that their app is safe with WIP before adding it to your **Protected apps** list. If you don’t get this statement, it’s possible that you could experience app compatibility issues due to an app losing the ability to access a necessary file after revocation.
-
-### Add a Recommended app to your Protected apps list
-For this example, we’re going to add a few recommended apps to the **Protected apps** list.
-
-**To add a recommended app**
-1. From the **Client apps - App protection policies** blade, click the name of your policy, and then click **Protected apps** from the menu that appears.
-
- The **Protected apps** blade appears, showing you any apps that are already included in the list for this policy.
-
- 
-
-2. From the **Protected apps** blade, click **Add apps**.
-
- The **Add apps** blade appears, showing you all **Recommended apps**.
-
- 
-
-3. Select each app you want to access your enterprise data, and then click **OK**.
-
- The **Protected apps** blade updates to show you your selected apps.
-
- 
-
-4. Click **Save** to save the **Protected apps** list to your policy.
-
-### Add a Store app to your Protected apps list
-For this example, we’re going to add Microsoft Power BI, a Windows store app, to the **Protected apps** list.
-
-**To add a Store app**
-1. From the **Client apps - App protection policies** blade, click the name of your policy, and then click **Protected apps** from the menu that appears.
-
- The **Protected apps** blade appears, showing you any apps that are already included in the list for this policy.
-
-2. From the **Protected apps** blade, click **Add apps**.
-
-3. On the **Add apps** blade, click **Store apps** from the dropdown list.
-
-4. Type the friendly name of the app, the publisher info, and the product name. For this example, the **Publisher** is `CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US` and the **Product name** is `Microsoft.MicrosoftPowerBIForWindows`.
-
-5. After you’ve entered the info into the fields, click **OK** to add the app to your **Protected apps** list, and then click **Save** to save the **Protected apps** list to your policy.
-
- >[!NOTE]
- >To add multiple Store apps at the same time, you can click the menu **(…)** at the end of the app row, and continue to add more apps. When you’re done, click **OK**.
-
- 
-
-#### Find the Name, Publisher, and Product name for Store apps
-If you don't know the publisher or product name for your Store app, you can find them for both desktop devices and Windows 10 Mobile phones by following these steps.
-
-**To find the publisher and product name values for Store apps without installing them**
-1. Go to the [Microsoft Store for Business](https://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, *Microsoft Power BI*.
-
-2. Copy the ID value from the app URL. For example, Microsoft Power BI ID URL is https://www.microsoft.com/store/p/microsoft-power-bi/9nblgggzlxn1, and you'd copy the ID value, `9nblgggzlxn1`.
-
-3. In a browser, run the Microsoft Store for Business portal web API, to return a JavaScript Object Notation (JSON) file that includes the publisher and product name values. For example, run https://bspmts.mp.microsoft.com/v1/public/catalog/Retail/Products/9nblgggzlxn1/applockerdata, where `9nblgggzlxn1` is replaced with your ID value.
-
- The API runs and opens a text editor with the app details.
-
- ```json
- {
- "packageIdentityName": "Microsoft.MicrosoftPowerBIForWindows",
- "publisherCertificateName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
- }
- ```
-
-4. Copy the `publisherCertificateName` value into the **Publisher** box and copy the `packageIdentityName` value into the **Name** box of the **Add apps** blade.
-
- >[!Important]
- >The JSON file might also return a windowsPhoneLegacyId value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as windowsPhoneLegacyId, and set the **Publisher Name** as CN= followed by the windowsPhoneLegacyId.
For example:
- {
-
-**To find the publisher and product name values for apps installed on Windows 10 mobile phones**
-1. If you need to add mobile apps that aren't distributed through the Microsoft Store for Business, you must use the **Windows Device Portal** feature.
-
- >[!NOTE]
- >Your PC and phone must be on the same wireless network.
-
-2. On the Windows Phone, go to **Settings**, choose **Update & security**, and then choose **For developers**.
-
-3. In the **For developers** screen, turn on **Developer mode**, turn on **Device Discovery**, and then turn on **Device Portal**.
-
-4. Copy the URL in the **Device Portal** area into your device's browser, and then accept the SSL certificate.
-
-5. In the **Device discovery** area, press **Pair**, and then enter the PIN into the website from the previous step.
-
-6. On the **Apps** tab of the website, you can see details for the running apps, including the publisher and product names.
-
-7. Start the app for which you're looking for the publisher and product name values.
-
-8. Copy the `publisherCertificateName` value and paste it into the **Publisher Name** box and the `packageIdentityName` value into the **Product Name** box of Intune.
-
- >[!Important]
- >The JSON file might also return a windowsPhoneLegacyId value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as windowsPhoneLegacyId, and set the **Publisher Name** as CN= followed by the windowsPhoneLegacyId.
"windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d",
}
For example:
- {
-
-### Add a Desktop app to your Protected apps list
-For this example, we’re going to add WordPad, a Desktop app, to the **Protected apps** list.
-
-**To add a Desktop app**
-1. From the **Client apps - App protection policies** blade, click the name of your policy, and then click **Protected apps** from the menu that appears.
-
- The **Protected apps** blade appears, showing you any apps that are already included in the list for this policy.
-
-2. From the **Protected apps** blade, click **Add apps**.
-
-3. On the **Add apps** blade, click **Desktop apps** from the dropdown list.
-
- The blade changes to show boxes for you to add the following, based on the results you want returned:
-
-
"windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d",
}
Field | -Manages | -
---|---|
All fields marked as “*” | -All files signed by any publisher. (Not recommended) | -
Name | -A friendly name for your app. You can't use this field by itself. However, you can use it in conjunction with any of the other fields. | -
Publisher (required) only | -Filling out this field, gives you all files signed by the named publisher. This might be useful if your company is the publisher and signer of internal line-of-business apps. This is a required field and must be filled out whether by itself or in conjunction with other fields. |
-
Publisher (required) and Product name only | -If you only fill out these fields, you’ll get all files for the specified product, signed by the named publisher. | -
Publisher (required), Product name, and File only | -If you only fill out these fields, you’ll get any version of the named file or package for the specified product, signed by the named publisher. | -
Publisher (required), Product name, File, and Min version only | -If you only fill out these fields, you’ll get the specified version or newer releases of the named file or package for the specified product, signed by the named publisher. This option is recommended for enlightened apps that weren't previously enlightened. |
-
Publisher (required), Product name, File, and Max version only | -If you only fill out these fields, you’ll get the specified version or older releases of the named file or package for the specified product, signed by the named publisher. | -
All fields completed | -If you fill out all fields, you’ll get the specified version of the named file or package for the specified product, signed by the named publisher. | -
Boundary type | -Value format | -Description | -
---|---|---|
Cloud Resources | -With proxy: contoso.sharepoint.com,contoso.internalproxy1.com| contoso.visualstudio.com,contoso.internalproxy2.com Without proxy: contoso.sharepoint.com|contoso.visualstudio.com |
- Specify the cloud resources to be treated as corporate and protected by WIP. For each cloud resource, you may also optionally specify a proxy server from your Internal proxy servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Internal proxy servers is considered enterprise. If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: URL <,proxy>|URL <,proxy> .Important In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can’t tell whether it’s attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the /*AppCompat*/ string to the setting. For example: URL <,proxy>|URL <,proxy>|/*AppCompat*/ .When using this string, we recommend that you also turn on [Azure Active Directory Conditional Access](https://docs.microsoft.com/azure/active-directory/active-directory-conditional-access), using the Domain joined or marked as compliant option, which blocks apps from accessing any enterprise cloud resources that are protected by conditional access. |
-
Network domain names | -corp.contoso.com,region.contoso.com | -Starting with Windows 10, version 1703, this field is optional. Specify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected. If you have multiple resources, you must separate them using the "," delimiter. |
-
Proxy servers | -proxy.contoso.com:80;proxy2.contoso.com:443 | -Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources. This list shouldn’t include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic. If you have multiple resources, you must separate them using the ";" delimiter. |
-
Internal proxy servers | -contoso.internalproxy1.com;contoso.internalproxy2.com | -Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources. This list shouldn’t include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic. If you have multiple resources, you must separate them using the ";" delimiter. |
-
IPv4 ranges | -**Starting IPv4 Address:** 3.4.0.1 **Ending IPv4 Address:** 3.4.255.254 **Custom URI:** 3.4.0.1-3.4.255.254, 10.0.0.1-10.255.255.254 |
- Starting with Windows 10, version 1703, this field is optional. Specify the addresses for a valid IPv4 value range within your intranet. These addresses, used with your Network domain names, define your corporate network boundaries. If you have multiple ranges, you must separate them using the "," delimiter. |
-
IPv6 ranges | -**Starting IPv6 Address:** 2a01:110:: **Ending IPv6 Address:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff **Custom URI:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff, fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff |
- Starting with Windows 10, version 1703, this field is optional. Specify the addresses for a valid IPv6 value range within your intranet. These addresses, used with your Network domain names, define your corporate network boundaries. If you have multiple ranges, you must separate them using the "," delimiter. |
-
Neutral resources | -sts.contoso.com,sts.contoso2.com | -Specify your authentication redirection endpoints for your company. These locations are considered enterprise or personal, based on the context of the connection before the redirection. If you have multiple resources, you must separate them using the "," delimiter. |
-
This setting has different behavior for mobile devices and desktops. - - - **On mobile devices.** When an employee reaches the value set here, the device is wiped of corporate data. - - - **On desktop devices.** When an employee reaches the value set here, the desktop is put into BitLocker recovery mode, instead of being wiped. You must have BitLocker installed on the device or this setting is ignored. - - - **Maximum amount of time (in minutes) allowed after the device is idle that will cause the device to become PIN or password locked.** Enter a numerical value for how many days can pass before a PIN must be changed. If you enter a value of 0, the device never becomes PIN or password locked while idle. - - >[!NOTE] - >You can set this value to be anything; however, it can't be longer than the time specified by the **Settings** app. If you exceed the maximum timeout value, this setting is ignored. - - -## Deploy your policy -After you’ve created your policy, you'll need to deploy it to your employees. MAM is deployed to users and not devices. - -**To deploy your policy** - -1. On the **Client apps - App protection policies** pane, click your newly-created policy, click **Assignments** from the menu that appears, and then click **Select groups**. - - A list of user groups, made up of all of the security groups in your Azure Active Directory, appear in the **Add user group** pane. - -2. Choose the group you want your policy to apply to, and then click **Select** to deploy the policy. - - The policy is deployed to the selected group. - -  - -## Related topics - -- [Implement server-side support for mobile application management on Windows](https://docs.microsoft.com/windows/client-management/mdm/implement-server-side-mobile-application-management) - -- [Microsoft Intune - Mobile Application Management (MAM) standalone blog post](https://blogs.technet.microsoft.com/cbernier/2016/01/05/microsoft-intune-mobile-application-management-mam-standalone/) - -- [MAM-supported apps](https://www.microsoft.com/cloud-platform/microsoft-intune-apps) - -- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md) - -- [How to collect Windows Information Protection (WIP) audit event logs](collect-wip-audit-event-logs.md) diff --git a/windows/security/information-protection/windows-information-protection/overview-create-wip-policy.md b/windows/security/information-protection/windows-information-protection/overview-create-wip-policy.md index dd7bb4891e..3af1d9b274 100644 --- a/windows/security/information-protection/windows-information-protection/overview-create-wip-policy.md +++ b/windows/security/information-protection/windows-information-protection/overview-create-wip-policy.md @@ -13,7 +13,7 @@ manager: dansimp audience: ITPro ms.collection: M365-security-compliance ms.topic: conceptual -ms.date: 03/05/2019 +ms.date: 03/11/2019 --- # Create a Windows Information Protection (WIP) policy using Microsoft Intune @@ -27,7 +27,6 @@ Microsoft Intune helps you create and deploy your enterprise data protection (WI ## In this section |Topic |Description | |------|------------| -|[Create a Windows Information Protection (WIP) policy with MDM using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md)|Details about how to use the Azure portal for Microsoft Intune to create and deploy your WIP policy with MDM (Mobile Device Management), including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | -|[Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune](create-wip-policy-using-mam-intune-azure.md)|Details about how to use the Azure portal for Microsoft Intune to create your WIP policy with MAM (Mobile Application Management), including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.| +|[Create a Windows Information Protection (WIP) policy using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md)|Details about how to use the Azure portal for Microsoft Intune to create and deploy your WIP policy with MDM (Mobile Device Management), including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | |[Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md) |Steps to create, verify, and perform a quick recovery using a Encrypting File System (EFS) Data Recovery Agent (DRA) certificate. | |[Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](wip-app-enterprise-context.md) |Use the Task Manager to determine whether an app is considered work, personal or exempt by Windows Information Protection (WIP). | diff --git a/windows/whats-new/docfx.json b/windows/whats-new/docfx.json index 12dd2d0312..15581c3398 100644 --- a/windows/whats-new/docfx.json +++ b/windows/whats-new/docfx.json @@ -47,6 +47,7 @@ }, "fileMetadata": {}, "template": [], - "dest": "win-whats-new" + "dest": "win-whats-new", + "markdownEngineName": "dfm" } } \ No newline at end of file