Skip to content

Commit b7189f4

Browse files
authored
Merge pull request #177371 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents aca2b12 + ccc027e commit b7189f4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

articles/active-directory/conditional-access/concept-conditional-access-conditions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 09/13/2021
9+
ms.date: 10/22/2021
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
1313
manager: karenhoran
14-
ms.reviewer: calebb
14+
ms.reviewer: calebb, sandeo-MSFT
1515

1616
ms.collection: M365-identity-device-management
1717
---
@@ -189,7 +189,7 @@ By selecting **Other clients**, you can specify a condition that affects apps th
189189

190190
## Device state (preview)
191191
> [!CAUTION]
192-
> **This preview feature is being deprecated.** Customers should use **Filter for devices** condition in Conditional Access to satisfy scenarios, previously achieved using Device state (preview) condition.
192+
> **This preview feature is being deprecated.** Customers should use **Filter for devices** condition in Conditional Access to satisfy scenarios, previously achieved using device state (preview) condition.
193193
194194
The device state condition can be used to exclude devices that are hybrid Azure AD joined and/or devices marked as compliant with a Microsoft Intune compliance policy from an organization's Conditional Access policies.
195195

articles/active-directory/conditional-access/concept-conditional-access-session.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ For more information, see the article [Configure authentication session manageme
7171

7272
## Customize continuous access evaluation
7373

74-
For organizations who wish to disable or strictly enforce [continuous access evaluation](concept-continuous-access-evaluation.md), this configuration is now an option in Conditional Access.
74+
[Continuous access evaluation](concept-continuous-access-evaluation.md) is auto enabled as part of an organization's Conditional Access policies. For organizations who wish to disable or strictly enforce continuous access evaluation, this configuration is now an option within the session control within Conditional Access. Admins can make this selection while creating a new policy or while editing an existing Conditional Access policy.
7575

7676
**Disable** works when **All cloud apps** are selected, and no conditions are selected.
7777

articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web)
3636

3737
| Extension Method | Description |
3838
| ---------------- | ------------ |
39-
| `AddInMemoryTokenCaches` | In memory token cache serialization. This implementation is great in samples. It's also good in production applications provided you don't mind if the token cache is lost when the web app is restarted. `AddInMemoryTokenCaches` takes an optional parameter of type `MsalMemoryTokenCacheOptions` that enables you to specify the duration after which the cache entry will expire unless it's used.
39+
| `AddInMemoryTokenCaches` | In memory token cache serialization. This implementation is great in samples and for daemon applications (app to app tokens / `AcquireTokenForClient`). It's also good in production applications provided you don't mind if the token cache is lost when the web app is restarted. Starting with Microsoft.Identity.Web 1.19.0, this configures MSAL to utilize a static (shared) cache across all app instances and it is significantly faster than other caching mechanisms.
4040
| `AddSessionTokenCaches` | The token cache is bound to the user session. This option isn't ideal if the ID token contains many claims as the cookie would become too large.
4141
| `AddDistributedTokenCaches` | The token cache is an adapter against the ASP.NET Core `IDistributedCache` implementation, therefore enabling you to choose between a distributed memory cache, a Redis cache, a distributed NCache, or a SQL Server cache. For details about the `IDistributedCache` implementations, see [Distributed memory cache](/aspnet/core/performance/caching/distributed).
4242

articles/security-center/security-center-wdatp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Confirm that your machine meets the necessary requirements for Defender for Endp
101101

102102
:::image type="content" source="./media/security-center-wdatp/enable-integration-with-edr.png" alt-text="Enable the integration between Azure Security Center and Microsoft's EDR solution, Microsoft Defender for Endpoint":::
103103

104-
Azure Security Center will automatically onboard your machines to Microsoft Defender for Endpoint. Onboarding might take up to 24 hours.
104+
Azure Security Center will automatically onboard your machines to Microsoft Defender for Endpoint. Onboarding might take up to 1 hour.
105105

106106
### [**Linux** (preview)](#tab/linux)
107107

@@ -142,7 +142,7 @@ If you've already enabled the integration with **Defender for Endpoint for Windo
142142
- Ignore any machines that are running other fanotify-based solutions (see details of the `fanotify` kernel option required in [Linux system requirements](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint-linux#system-requirements))
143143
- Detect any previous installations of Defender for Endpoint and reconfigure them to integrate with Security Center
144144

145-
Onboarding might take up to 24 hours.
145+
Onboarding might take up to 1 hour.
146146

147147
> [!NOTE]
148148
> The next time you return to this page of the Azure portal, the **Enable for Linux machines** button won't be shown. To disable the integration for Linux, you'll need to disable it for Windows too by clearing the checkbox for **Allow Microsoft Defender for Endpoint to access my data**, and selecting **Save**.
@@ -176,7 +176,7 @@ If you've never enabled the integration for Windows, the **Allow Microsoft Defen
176176
- Ignore any Linux machines that are running other fanotify-based solutions (see details of the `fanotify` kernel option required in [Linux system requirements](/microsoft-365/security/defender-endpoint/microsoft-defender-endpoint-linux#system-requirements))
177177
- Detect any previous installations of Defender for Endpoint and reconfigure them to integrate with Security Center
178178

179-
Onboarding might take up to 24 hours.
179+
Onboarding might take up to 1 hour.
180180

181181
1. To verify installation of Defender for Endpoint on a Linux machine, run the following shell command on your machines:
182182

0 commit comments

Comments
 (0)