Merge branch 'master' into 4872124-nimishasatapathy-Dictributedlinktracking

This commit is contained in:
Tina Burden 2021-03-26 10:10:20 -07:00 committed by GitHub
commit 9563f61a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 9 deletions

View File

@ -18479,6 +18479,11 @@
"source_path": "windows/security/threat-protection/microsoft-defender-atp/mac-device-control-overview.md",
"redirect_url": "/microsoft-365/security/defender-endpoint/mac-device-control-overview",
"redirect_document_id": false
}
},
{
"source_path": "windows/security/threat-protection/windows-defender-exploit-guard/controlled-folders-exploit-guard.md",
"redirect_url": "/microsoft-365/security/defender-endpoint/controlled-folders",
"redirect_document_id": false
}
]
}

View File

@ -28,8 +28,6 @@ Internet Explorer 11 makes browsing the web faster, easier, safer, and more reli
- [Options for blocking automatic delivery](#options-for-blocking-automatic-delivery)
- [Availability of Internet Explorer 11](#availability-of-internet-explorer-11)
- [Prevent automatic installation of Internet Explorer 11 with WSUS](#prevent-automatic-installation-of-internet-explorer-11-with-wsus)
## Automatic updates delivery process

View File

@ -22,7 +22,7 @@ ms.date: 03/10/2021
As an admin, you can acquire apps from the Microsoft Store for Business and Education for your employees. Some apps are free, and some have a price. For info on app types that are supported, see [Apps in the Microsoft Store for Business](apps-in-microsoft-store-for-business.md). The following sections explain some of the settings for shopping.
## App licensing model
The Microsoft Store supports two options to license apps: online and offline. **Online** licensing is the default licensing model. Online licensed apps require users and devices to connect to the Microsoft Store services to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Admins control whether or not offline apps are available in Microsoft Store with an offline app visibility setting. For more information, see [offline license visibility](./update-microsoft-store-for-business-account-settings.md#offline-licensing).
The Microsoft Store supports two options to license apps: online and offline. **Online** licensing is the default licensing model. Online licensed apps require users and devices to connect to the Microsoft Store services to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Admins control whether or not offline apps are available in Microsoft Store with an offline app visibility setting.
For more information on the Microsoft Store licensing model, see [licensing model](./apps-in-microsoft-store-for-business.md#licensing-model).

View File

@ -69,7 +69,7 @@ Distribution options for online-licensed apps include the ability to:
- Distribute through a management tool.
### Offline licensing
Offline licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in Microsoft Store. This model means organizations can deploy apps when users or devices do not have connectivity to Microsoft Store. Admins control whether or not offline apps are available in Microsoft Store with an offline app visibility setting. For more information, see [offline license visibility](./update-microsoft-store-for-business-account-settings.md#offline-licensing).
Offline licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in Microsoft Store. This model means organizations can deploy apps when users or devices do not have connectivity to Microsoft Store. Admins control whether or not offline apps are available in Microsoft Store with an offline app visibility setting.
You have the following distribution options for offline-licensed apps:

View File

@ -67,7 +67,7 @@ ms.localizationpriority: medium
| New or changed topic | Description |
| --- | --- |
| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | New |
| [App requests](./acquire-apps-microsoft-store-for-business.md#request-apps) | New |
| [Acquire apps](acquire-apps-microsoft-store-for-business.md#acquire-apps) | New |
| [Settings reference: Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md) </br> and </br> [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) | Updates for UI changes in **Settings**. |
## July 2017

View File

@ -236,7 +236,7 @@ The following table describes some features that have interoperability issues we
<tr class="odd">
<td><p>WEDL_AssignedAccess class</p></td>
<td><p>Although you can use this class to configure and manage basic lockdown features for assigned access, we recommend that you use the Windows PowerShell cmdlets instead.</p>
<p>If you need to use assigned access API, see <a href="./w/windows-hardware/customize/enterprise/wedl-assignedaccess" data-raw-source="[WEDL_AssignedAccess](./w/windows-hardware/customize/enterprise/wedl-assignedaccess)">WEDL_AssignedAccess</a>.</p></td>
<p>If you need to use assigned access API, see <a href="https://docs.microsoft.com/windows-hardware/customize/enterprise/wedl-assignedaccess" data-raw-source="[WEDL_AssignedAccess](./w/windows-hardware/customize/enterprise/wedl-assignedaccess)">WEDL_AssignedAccess</a>.</p></td>
</tr>
<tr class="even">
<td><p>Welcome Screen</p></td>

View File

@ -114,7 +114,6 @@ In addition to quickly responding to advanced attacks, Microsoft Defender for En
- [Configure automated investigation and remediation in Defender for Endpoint](/microsoft-365/security/defender-endpoint/configure-automated-investigations-remediation)
- [Visit the Action center to see remediation actions](/microsoft-365/security/defender-endpoint/auto-investigation-action-center)
- [Review remediation actions following an automated investigation](/microsoft-365/security/defender-endpoint/manage-auto-investigation)
- [View the details and results of an automated investigation](microsoft-defender-atp/autoir-investigation-results.md)
<a name="mte"></a>

View File

@ -124,5 +124,5 @@ The table in this section summarizes the functionality and features that are ava
- [Microsoft Defender Antivirus on Windows Server](microsoft-defender-antivirus-on-windows-server-2016.md)
- [EDR in block mode](/microsoft-365/security/defender-endpoint/edr-in-block-mode)
- [Configure Endpoint Protection](/mem/configmgr/protect/deploy-use/endpoint-protection-configure)
- [Address false positives/negatives in Microsoft Defender for Endpoint](../microsoft-defender-atp/defender-endpoint-false-positives-negatives.md)
- [Address false positives/negatives in Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint/defender-endpoint-false-positives-negatives)
- [Learn about Microsoft 365 Endpoint data loss prevention](/microsoft-365/compliance/endpoint-dlp-learn-about)