Skip to content

Commit f3e4e7b

Browse files
authored
Merge pull request #201271 from MicrosoftDocs/main
6/10 PM Publish
2 parents a2f06d5 + 220c4e6 commit f3e4e7b

File tree

223 files changed

+2606
-2445
lines changed

Some content is hidden

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

223 files changed

+2606
-2445
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6931,6 +6931,11 @@
69316931
"redirect_url": "/azure/azure-functions/functions-bindings-event-hubs-output",
69326932
"redirect_document_id": false
69336933
},
6934+
{
6935+
"source_path_from_root": "/articles/azure-functions/functions-bindings-errors.md",
6936+
"redirect_url": "/azure/azure-functions/functions-bindings-error-pages",
6937+
"redirect_document_id": false
6938+
},
69346939
{
69356940
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
69366941
"redirect_url": "/azure/azure-government",
@@ -35511,6 +35516,11 @@
3551135516
"redirect_url": "/azure/cognitive-services/speech-service/role-based-access-control",
3551235517
"redirect_document_id": false
3551335518
},
35519+
{
35520+
"source_path_from_root": "/articles/cognitive-services/Speech-Service/index-speech-translation.yml",
35521+
"redirect_url": "/azure/cognitive-services/speech-service/speech-translation",
35522+
"redirect_document_id": false
35523+
},
3551435524
{
3551535525
"source_path_from_root": "/articles/cognitive-services/Speech-Service/voice-first-virtual-assistants.md",
3551635526
"redirect_url": "/azure/cognitive-services/Speech-Service/voice-assistants",

articles/active-directory/develop/index.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ tools:
154154
## ROW 1 ######################
155155
- title: .NET
156156
url: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet
157-
imageSrc: https://docs.microsoft.com/media/logos/logo_Csharp.svg
157+
imageSrc: /media/logos/logo_Csharp.svg
158158
- title: Android
159159
url: https://github.com/AzureAD/microsoft-authentication-library-for-android
160160
imageSrc: ./media/hub/android.svg
@@ -164,20 +164,20 @@ tools:
164164
## ROW 2 ######################
165165
- title: iOS & macOS
166166
url: https://github.com/AzureAD/microsoft-authentication-library-for-objc
167-
imageSrc: https://docs.microsoft.com/media/logos/logo_ios.svg
167+
imageSrc: /media/logos/logo_ios.svg
168168
- title: Java
169169
url: https://github.com/AzureAD/microsoft-authentication-library-for-java
170-
imageSrc: https://docs.microsoft.com/media/logos/logo_java.svg
170+
imageSrc: /media/logos/logo_java.svg
171171
- title: JavaScript
172172
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-browser
173-
imageSrc: https://docs.microsoft.com/media/logos/logo_js.svg
173+
imageSrc: /media/logos/logo_js.svg
174174
## ROW 3 ######################
175175
- title: Node.js
176176
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node
177177
imageSrc: ./media/hub/node.svg
178178
- title: Python
179179
url: https://github.com/AzureAD/microsoft-authentication-library-for-python
180-
imageSrc: https://docs.microsoft.com/media/logos/logo_python.svg
180+
imageSrc: /media/logos/logo_python.svg
181181
- title: React
182182
url: https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-react
183183
imageSrc: ./media/hub/react.svg
@@ -218,4 +218,4 @@ additionalContent:
218218
links:
219219
- url: ../app-provisioning/user-provisioning.md
220220
text: Application user and role provisioning documentation
221-
## BAND 5 - ADDITIONAL CONTENT END ##########################################################################################################################
221+
## BAND 5 - ADDITIONAL CONTENT END ##########################################################################################################################

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: enterprise-users
1010
ms.workload: identity
1111
ms.topic: overview
12-
ms.date: 06/03/2022
12+
ms.date: 06/08/2022
1313
ms.author: curtand
1414
ms.reviewer: krbain
1515
ms.custom: it-pro
@@ -67,7 +67,7 @@ A membership rule that automatically populates a group with users or devices is
6767
- Operator
6868
- Value
6969

70-
The order of the parts within an expression are important to avoid syntax errors.
70+
The order of the parts within an expression is important to avoid syntax errors.
7171

7272
## Supported properties
7373

@@ -90,41 +90,41 @@ dirSyncEnabled |true false |user.dirSyncEnabled -eq true
9090

9191
| Properties | Allowed values | Usage |
9292
| --- | --- | --- |
93-
| city |Any string value or *null* |(user.city -eq "value") |
94-
| country |Any string value or *null* |(user.country -eq "value") |
95-
| companyName | Any string value or *null* | (user.companyName -eq "value") |
96-
| department |Any string value or *null* |(user.department -eq "value") |
97-
| displayName |Any string value |(user.displayName -eq "value") |
98-
| employeeId |Any string value |(user.employeeId -eq "value")<br>(user.employeeId -ne *null*) |
99-
| facsimileTelephoneNumber |Any string value or *null* |(user.facsimileTelephoneNumber -eq "value") |
100-
| givenName |Any string value or *null* |(user.givenName -eq "value") |
101-
| jobTitle |Any string value or *null* |(user.jobTitle -eq "value") |
102-
| mail |Any string value or *null* (SMTP address of the user) |(user.mail -eq "value") |
103-
| mailNickName |Any string value (mail alias of the user) |(user.mailNickName -eq "value") |
104-
| memberOf | Any string value (valid group object ID) | (device.memberof -any (group.objectId -in ['value'])) |
105-
| mobile |Any string value or *null* |(user.mobile -eq "value") |
106-
| objectId |GUID of the user object |(user.objectId -eq "11111111-1111-1111-1111-111111111111") |
107-
| onPremisesDistinguishedName (preview)| Any string value or *null* |(user.onPremisesDistinguishedName -eq "value") |
108-
| onPremisesSecurityIdentifier | On-premises security identifier (SID) for users who were synchronized from on-premises to the cloud. |(user.onPremisesSecurityIdentifier -eq "S-1-1-11-1111111111-1111111111-1111111111-1111111") |
109-
| passwordPolicies |None DisableStrongPassword DisablePasswordExpiration DisablePasswordExpiration, DisableStrongPassword |(user.passwordPolicies -eq "DisableStrongPassword") |
110-
| physicalDeliveryOfficeName |Any string value or *null* |(user.physicalDeliveryOfficeName -eq "value") |
111-
| postalCode |Any string value or *null* |(user.postalCode -eq "value") |
112-
| preferredLanguage |ISO 639-1 code |(user.preferredLanguage -eq "en-US") |
113-
| sipProxyAddress |Any string value or *null* |(user.sipProxyAddress -eq "value") |
114-
| state |Any string value or *null* |(user.state -eq "value") |
115-
| streetAddress |Any string value or *null* |(user.streetAddress -eq "value") |
116-
| surname |Any string value or *null* |(user.surname -eq "value") |
117-
| telephoneNumber |Any string value or *null* |(user.telephoneNumber -eq "value") |
118-
| usageLocation |Two lettered country/region code |(user.usageLocation -eq "US") |
119-
| userPrincipalName |Any string value |(user.userPrincipalName -eq "alias@domain") |
120-
| userType |member guest *null* |(user.userType -eq "Member") |
93+
| city |Any string value or *null* | user.city -eq "value" |
94+
| country |Any string value or *null* | user.country -eq "value" |
95+
| companyName | Any string value or *null* | user.companyName -eq "value" |
96+
| department |Any string value or *null* | user.department -eq "value" |
97+
| displayName |Any string value | user.displayName -eq "value" |
98+
| employeeId |Any string value | user.employeeId -eq "value"<br>user.employeeId -ne *null* |
99+
| facsimileTelephoneNumber |Any string value or *null* | user.facsimileTelephoneNumber -eq "value" |
100+
| givenName |Any string value or *null* | user.givenName -eq "value" |
101+
| jobTitle |Any string value or *null* | user.jobTitle -eq "value" |
102+
| mail |Any string value or *null* (SMTP address of the user) | user.mail -eq "value" |
103+
| mailNickName |Any string value (mail alias of the user) | user.mailNickName -eq "value" |
104+
| memberOf | Any string value (valid group object ID) | user.memberof -any (group.objectId -in ['value']) |
105+
| mobile |Any string value or *null* | user.mobile -eq "value" |
106+
| objectId |GUID of the user object | user.objectId -eq "11111111-1111-1111-1111-111111111111" |
107+
| onPremisesDistinguishedName (preview)| Any string value or *null* | user.onPremisesDistinguishedName -eq "value" |
108+
| onPremisesSecurityIdentifier | On-premises security identifier (SID) for users who were synchronized from on-premises to the cloud. | user.onPremisesSecurityIdentifier -eq "S-1-1-11-1111111111-1111111111-1111111111-1111111" |
109+
| passwordPolicies |None<br>DisableStrongPassword<br>DisablePasswordExpiration<br>DisablePasswordExpiration, DisableStrongPassword | user.passwordPolicies -eq "DisableStrongPassword" |
110+
| physicalDeliveryOfficeName |Any string value or *null* | user.physicalDeliveryOfficeName -eq "value" |
111+
| postalCode |Any string value or *null* | user.postalCode -eq "value" |
112+
| preferredLanguage |ISO 639-1 code | user.preferredLanguage -eq "en-US" |
113+
| sipProxyAddress |Any string value or *null* | user.sipProxyAddress -eq "value" |
114+
| state |Any string value or *null* | user.state -eq "value" |
115+
| streetAddress |Any string value or *null* | user.streetAddress -eq "value" |
116+
| surname |Any string value or *null* | user.surname -eq "value" |
117+
| telephoneNumber |Any string value or *null* | user.telephoneNumber -eq "value" |
118+
| usageLocation |Two lettered country/region code | user.usageLocation -eq "US" |
119+
| userPrincipalName |Any string value | user.userPrincipalName -eq "alias@domain" |
120+
| userType |member guest *null* | user.userType -eq "Member" |
121121

122122
### Properties of type string collection
123123

124-
| Properties | Allowed values | Usage |
124+
| Properties | Allowed values | Example |
125125
| --- | --- | --- |
126-
| otherMails |Any string value |(user.otherMails -contains "alias@domain") |
127-
| proxyAddresses |SMTP: alias@domain smtp: alias@domain |(user.proxyAddresses -contains "SMTP: alias@domain") |
126+
| otherMails |Any string value | user.otherMails -contains "alias@domain" |
127+
| proxyAddresses |SMTP: alias@domain smtp: alias@domain | user.proxyAddresses -contains "SMTP: alias@domain" |
128128

129129
For the properties used for device rules, see [Rules for devices](#rules-for-devices).
130130

@@ -162,12 +162,12 @@ The **-match** operator is used for matching any regular expression. Examples:
162162
```
163163
user.displayName -match "Da.*"
164164
```
165-
Da, Dav, David evaluate to true, aDa evaluates to false.
165+
`Da`, `Dav`, `David` evaluate to true, aDa evaluates to false.
166166

167167
```
168168
user.displayName -match ".*vid"
169169
```
170-
David evaluates to true, Da evaluates to false.
170+
`David` evaluates to true, `Da` evaluates to false.
171171

172172
## Supported values
173173

@@ -278,7 +278,7 @@ user.assignedPlans -any (assignedPlan.service -eq "SCO" -and assignedPlan.capabi
278278

279279
#### Example 3
280280

281-
The following expression selects all users who have no asigned service plan:
281+
The following expression selects all users who have no assigned service plan:
282282

283283
```
284284
user.assignedPlans -all (assignedPlan.servicePlanId -eq "")
@@ -383,22 +383,22 @@ The following device attributes can be used.
383383

384384
Device attribute | Values | Example
385385
----- | ----- | ----------------
386-
accountEnabled | true false | (device.accountEnabled -eq true)
387-
displayName | any string value |(device.displayName -eq "Rob iPhone")
388-
deviceOSType | any string value | (device.deviceOSType -eq "iPad") -or (device.deviceOSType -eq "iPhone")<br>(device.deviceOSType -contains "AndroidEnterprise")<br>(device.deviceOSType -eq "AndroidForWork")<br>(device.deviceOSType -eq "Windows")
389-
deviceOSVersion | any string value | (device.deviceOSVersion -eq "9.1")<br>(device.deviceOSVersion -startsWith "10.0.1")
390-
deviceCategory | a valid device category name | (device.deviceCategory -eq "BYOD")
391-
deviceManufacturer | any string value | (device.deviceManufacturer -eq "Samsung")
392-
deviceModel | any string value | (device.deviceModel -eq "iPad Air")
393-
deviceOwnership | Personal, Company, Unknown | (device.deviceOwnership -eq "Company")
394-
enrollmentProfileName | Apple Device Enrollment Profile name, Android Enterprise Corporate-owned dedicated device Enrollment Profile name, or Windows Autopilot profile name | (device.enrollmentProfileName -eq "DEP iPhones")
395-
isRooted | true false | (device.isRooted -eq true)
396-
managementType | MDM (for mobile devices) | (device.managementType -eq "MDM")
397-
memberOf | Any string value (valid group object ID) | (user.memberof -any (group.objectId -in ['value']))
398-
deviceId | a valid Azure AD device ID | (device.deviceId -eq "d4fe7726-5966-431c-b3b8-cddc8fdb717d")
399-
objectId | a valid Azure AD object ID | (device.objectId -eq "76ad43c9-32c5-45e8-a272-7b58b58f596d")
400-
devicePhysicalIds | any string value used by Autopilot, such as all Autopilot devices, OrderID, or PurchaseOrderID | (device.devicePhysicalIDs -any _ -contains "[ZTDId]") (device.devicePhysicalIds -any _ -eq "[OrderID]:179887111881") (device.devicePhysicalIds -any _ -eq "[PurchaseOrderId]:76222342342")
401-
systemLabels | any string matching the Intune device property for tagging Modern Workplace devices | (device.systemLabels -contains "M365Managed")
386+
accountEnabled | true false | device.accountEnabled -eq true
387+
displayName | any string value | device.displayName -eq "Rob iPhone"
388+
deviceOSType | any string value | (device.deviceOSType -eq "iPad") -or (device.deviceOSType -eq "iPhone")<br>device.deviceOSType -contains "AndroidEnterprise"<br>device.deviceOSType -eq "AndroidForWork"<br>device.deviceOSType -eq "Windows"
389+
deviceOSVersion | any string value | device.deviceOSVersion -eq "9.1"<br>device.deviceOSVersion -startsWith "10.0.1"
390+
deviceCategory | a valid device category name | device.deviceCategory -eq "BYOD"
391+
deviceManufacturer | any string value | device.deviceManufacturer -eq "Samsung"
392+
deviceModel | any string value | device.deviceModel -eq "iPad Air"
393+
deviceOwnership | Personal, Company, Unknown | device.deviceOwnership -eq "Company"
394+
enrollmentProfileName | Apple Device Enrollment Profile name, Android Enterprise Corporate-owned dedicated device Enrollment Profile name, or Windows Autopilot profile name | device.enrollmentProfileName -eq "DEP iPhones"
395+
isRooted | true false | device.isRooted -eq true
396+
managementType | MDM (for mobile devices) | device.managementType -eq "MDM"
397+
memberOf | Any string value (valid group object ID) | device.memberof -any (group.objectId -in ['value'])
398+
deviceId | a valid Azure AD device ID | device.deviceId -eq "d4fe7726-5966-431c-b3b8-cddc8fdb717d"
399+
objectId | a valid Azure AD object ID | device.objectId -eq "76ad43c9-32c5-45e8-a272-7b58b58f596d"
400+
devicePhysicalIds | any string value used by Autopilot, such as all Autopilot devices, OrderID, or PurchaseOrderID | device.devicePhysicalIDs -any _ -contains "[ZTDId]"<br>(device.devicePhysicalIds -any _ -eq "[OrderID]:179887111881"<br>(device.devicePhysicalIds -any _ -eq "[PurchaseOrderId]:76222342342"
401+
systemLabels | any string matching the Intune device property for tagging Modern Workplace devices | device.systemLabels -contains "M365Managed"
402402

403403
> [!NOTE]
404404
> For the deviceOwnership when creating Dynamic Groups for devices you need to set the value equal to "Company". On Intune the device ownership is represented instead as Corporate. Refer to [OwnerTypes](/intune/reports-ref-devices#ownertypes) for more details.

articles/active-directory/external-identities/cross-cloud-settings.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ To set up B2B collaboration between partner organizations in different Microsoft
3434

3535
After each organization has completed these steps, Azure AD B2B collaboration between the organizations is enabled.
3636

37+
> [!NOTE]
38+
> B2B direct connect is not supported for collaboration with Azure AD tenants in a different Microsoft cloud.
39+
3740
## Before you begin
3841

3942
- **Obtain the partner's tenant ID.** To enable B2B collaboration with a partner's Azure AD organization in another Microsoft Azure cloud, you'll need the partner's tenant ID. Using an organization's domain name for lookup isn't available in cross-cloud scenarios.

articles/active-directory/external-identities/cross-tenant-access-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ To set up B2B collaboration, both organizations configure their Microsoft cloud
6969
- Use B2B collaboration to invite a user in the partner tenant to access resources in your organization, including web line-of-business apps, SaaS apps, and SharePoint Online sites, documents, and files.
7070
- Apply Conditional Access policies to the B2B collaboration user and opt to trust device claims (compliant claims and hybrid Azure AD joined claims) from the user’s home tenant.
7171

72+
> [!NOTE]
73+
> B2B direct connect is not supported for collaboration with Azure AD tenants in a different Microsoft cloud.
74+
7275
For configuration steps, see [Configure Microsoft cloud settings for B2B collaboration (Preview)](cross-cloud-settings.md).
7376

7477
> [!NOTE]

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ For more information on setting the PowerShell execution policy, see [Set-Execut
5151
### Azure AD Connect server
5252
The Azure AD Connect server contains critical identity data. It's important that administrative access to this server is properly secured. Follow the guidelines in [Securing privileged access](/windows-server/identity/securing-privileged-access/securing-privileged-access).
5353

54-
The Azure AD Connect server must be treated as a Tier 0 component as documented in the [Active Directory administrative tier model](/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material). We recommend hardening the Azure AD Connect server as a Control Plane asset by following the guidance provided in [Secure Privileged Access]( https://docs.microsoft.com/security/compass/overview)
54+
The Azure AD Connect server must be treated as a Tier 0 component as documented in the [Active Directory administrative tier model](/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material). We recommend hardening the Azure AD Connect server as a Control Plane asset by following the guidance provided in [Secure Privileged Access](/security/compass/overview)
5555

5656
To read more about securing your Active Directory environment, see [Best practices for securing Active Directory](/windows-server/identity/ad-ds/plan/security-best-practices/best-practices-for-securing-active-directory).
5757

@@ -73,7 +73,7 @@ To read more about securing your Active Directory environment, see [Best practic
7373
### Harden your Azure AD Connect server
7474
We recommend that you harden your Azure AD Connect server to decrease the security attack surface for this critical component of your IT environment. Following these recommendations will help to mitigate some security risks to your organization.
7575

76-
- We recommend hardening the Azure AD Connect server as a Control Plane (formerly Tier 0) asset by following the guidance provided in [Secure Privileged Access]( https://docs.microsoft.com/security/compass/overview) and [Active Directory administrative tier model](/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material).
76+
- We recommend hardening the Azure AD Connect server as a Control Plane (formerly Tier 0) asset by following the guidance provided in [Secure Privileged Access](/security/compass/overview) and [Active Directory administrative tier model](/windows-server/identity/securing-privileged-access/securing-privileged-access-reference-material).
7777
- Restrict administrative access to the Azure AD Connect server to only domain administrators or other tightly controlled security groups.
7878
- Create a [dedicated account for all personnel with privileged access](/windows-server/identity/securing-privileged-access/securing-privileged-access). Administrators shouldn't be browsing the web, checking their email, and doing day-to-day productivity tasks with highly privileged accounts.
7979
- Follow the guidance provided in [Securing privileged access](/windows-server/identity/securing-privileged-access/securing-privileged-access).

articles/active-directory/manage-apps/secure-hybrid-access.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ The following partners offer pre-built solutions to support **conditional access
5454

5555
The following partners offer pre-built solutions and detailed guidance for integrating with Azure AD.
5656

57+
- [AWS](../saas-apps/aws-clientvpn-tutorial.md)
58+
59+
- [Check Point](../saas-apps/check-point-remote-access-vpn-tutorial.md)
60+
5761
- [Cisco AnyConnect](../saas-apps/cisco-anyconnect.md)
5862

5963
- [Fortinet](../saas-apps/fortigate-ssl-vpn-tutorial.md)

0 commit comments

Comments
 (0)