Skip to content

Commit 03580b1

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into work-auth-links
2 parents cbba48a + eab13c8 commit 03580b1

File tree

117 files changed

+707
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+707
-652
lines changed

articles/active-directory/conditional-access/concept-condition-filters-for-devices.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Use filter for devices in Conditional Access to enhance security po
44
ms.service: active-directory
55
ms.subservice: conditional-access
66
ms.topic: conceptual
7-
ms.date: 11/08/2021
7+
ms.date: 12/03/2021
88

99
ms.author: joflore
1010
author: MicrosoftGuyJFlo
@@ -125,6 +125,9 @@ The following device attributes can be used with the filter for devices conditio
125125
| trustType | Equals, NotEquals | A valid registered state for devices. Supported values are: AzureAD (used for Azure AD joined devices), ServerAD (used for Hybrid Azure AD joined devices), Workplace (used for Azure AD registered devices) | (device.trustType -notIn ‘ServerAD, Workplace’) |
126126
| extensionAttribute1-15 | Equals, NotEquals, StartsWith, NotStartsWith, EndsWith, NotEndsWith, Contains, NotContains, In, NotIn | extensionAttributes1-15 are attributes that customers can use for device objects. Customers can update any of the extensionAttributes1 through 15 with custom values and use them in the filter for devices condition in Conditional Access. Any string value can be used. | (device.extensionAttribute1 -eq ‘SAW’) |
127127

128+
> [!NOTE]
129+
> The `Contains` and the `NotContains` operators work differently depending on attribute types. For string attributes such as `operatingSystem` and `model`, the `Contains` operator indicates whether a specified substring occurs within the attribute. For string collection attributes such as `physicalIds` and `systemLabels`, the `Contains` operator indicates whether a specified string matches one of the whole strings in the collection.
130+
128131
## Policy behavior with filter for devices
129132

130133
The filter for devices condition in Conditional Access evaluates policy based on device attributes of a registered device in Azure AD and hence it is important to understand under what circumstances the policy is applied or not applied. The table below illustrates the behavior when a filter for devices condition are configured.

articles/active-directory/devices/overview.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ Devices that are Azure AD joined benefit from [SSO to your organization's on-pre
5252

5353
Getting devices in to Azure AD can be done in a self-service manner or a controlled process managed by administrators.
5454

55-
## License requirements
56-
57-
[!INCLUDE [Active Directory P1 license](../../../includes/active-directory-p1-license.md)]
58-
5955
## Next steps
6056

6157
- Learn more about [Azure AD registered devices](concept-azure-ad-register.md)

articles/active-directory/manage-apps/tenant-restrictions.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-mgmt
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 12/3/2021
11+
ms.date: 12/6/2021
1212
ms.author: davidmu
1313
ms.reviewer: hirsin
1414
ms.collection: M365-identity-device-management
@@ -136,6 +136,10 @@ Outlook and Skype for Business clients that support modern authentication may st
136136

137137
For Outlook on Windows, customers may choose to implement restrictions preventing end users from adding non-approved mail accounts to their profiles. For example, see the [Prevent adding non-default Exchange accounts](https://gpsearch.azurewebsites.net/default.aspx?ref=1) group policy setting.
138138

139+
### Azure RMS and Office Message Encryption incompatibility
140+
141+
The [Azure Rights Management Service](https://docs.microsoft.com/azure/information-protection/what-is-azure-rms) (RMS) and [Office Message Encryption](https://docs.microsoft.com/microsoft-365/compliance/ome) features are not compatible with tenant restrictions. These features rely on signing your users into other tenants in order to get decryption keys for the encrypted documents. Because tenant restrictions blocks access to other tenants, encrypted mail and documents sent to your users from untrusted tenants will not be accessible.
142+
139143
## Testing
140144

141145
If you want to try out tenant restrictions before implementing it for your whole organization, you have two options: a host-based approach using a tool like Fiddler, or a staged rollout of proxy settings.

articles/api-management/api-management-howto-integrate-internal-vnet-appgateway.md

Lines changed: 331 additions & 386 deletions
Large diffs are not rendered by default.

articles/availability-zones/az-region.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ In the Product Catalog, always-available services are listed as "non-regional" s
175175
| Azure Advisor | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |
176176
| Azure Blueprints | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |
177177
| Azure Bot Services | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |
178-
| Azure Front Door | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |
179178
| Microsoft Defender for IoT | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |
180179
| Azure Front Door | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |
181180
| Azure Information Protection | ![An icon that signifies this service is always available.](media/icon-always-available.svg) |

articles/azure-arc/servers/private-link-security.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,10 @@ It may take up to 15 minutes for the Private Link Scope to accept connections fr
292292

293293
1. Check your on-premises DNS server(s) to verify it is either forwarding to Azure DNS or is configured with appropriate A records in your private link zone. These lookup commands should return private IP addresses in your Azure virtual network. If they resolve public IP addresses, double check your machine or server and network’s DNS configuration.
294294

295+
```
295296
nslookup gbl.his.arc.azure.com
296297
nslookup agentserviceapi.guestconfiguration.azure.com
298+
```
297299
298300
1. If you are having trouble onboarding a machine or server, confirm that you’ve added the Azure Active Directory and Azure Resource Manager service tags to your local network firewall. The agent needs to communicate with these services over the internet until private endpoints are available for these services.
299301

articles/azure-functions/functions-premium-plan.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ See the complete regional availability of Functions on the [Azure web site](http
166166
|Brazil South| 100 | 20 |
167167
|Canada Central| 100 | 20 |
168168
|Central India| 100 | 20 |
169-
|Central US| 100 | 20 |
169+
|Central US| 100 | 40 |
170170
|China East 2| 100 | 20 |
171171
|China North 2| 100 | 20 |
172172
|East Asia| 100 | 20 |
@@ -180,7 +180,7 @@ See the complete regional availability of Functions on the [Azure web site](http
180180
|Korea Central| 100 | 20 |
181181
|Korea South| Not Available | 20 |
182182
|North Central US| 100 | 20 |
183-
|North Europe| 100 | 20 |
183+
|North Europe| 100 | 40 |
184184
|Norway East| 100 | 20 |
185185
|South Africa North| 100 | 20 |
186186
|South Central US| 100 | 20 |
@@ -195,7 +195,7 @@ See the complete regional availability of Functions on the [Azure web site](http
195195
|USGov Texas| 100 | Not Available |
196196
|USGov Virginia| 100 | 20 |
197197
|West Central US| 100 | 20 |
198-
|West Europe| 100 | 20 |
198+
|West Europe| 100 | 40 |
199199
|West India| 100 | 20 |
200200
|West US| 100 | 20 |
201201
|West US 2| 100 | 20 |

articles/azure-maps/android-map-add-line-layer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Add a line layer to Android maps | Microsoft Azure Maps
33
description: Learn how to add lines to maps. See examples that use the Azure Maps Android SDK to add line layers to maps and to customize lines with symbols and color gradients.
4-
author: anastasia-ms
5-
ms.author: v-stharr
4+
author: stevemunk
5+
ms.author: v-munksteve
66
ms.date: 2/26/2021
77
ms.topic: conceptual
88
ms.service: azure-maps

articles/azure-maps/android-map-events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Handle map events in Android maps | Microsoft Azure Maps
33
description: Learn which events are fired when users interact with maps. View a list of all supported map events. See how to use the Azure Maps Android SDK to handle events.
4-
author: anastasia-ms
5-
ms.author: v-stharr
4+
author: stevemunk
5+
ms.author: v-munksteve
66
ms.date: 2/26/2021
77
ms.topic: conceptual
88
ms.service: azure-maps

articles/azure-maps/azure-maps-event-grid-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: React to Azure Maps events by using Event Grid
33
description: Find out how to react to Azure Maps events involving geofences. See how to listen to map events and how to use Event Grid to reroute events to event handlers.
4-
author: anastasia-ms
5-
ms.author: v-stharr
4+
author: stevemunk
5+
ms.author: v-munksteve
66
ms.date: 07/16/2020
77
ms.topic: conceptual
88
ms.service: azure-maps

0 commit comments

Comments
 (0)