Skip to content

Commit 1531b1b

Browse files
authored
Merge pull request #204138 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b2a47a6 + 63191c2 commit 1531b1b

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

articles/active-directory/external-identities/b2b-direct-connect-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ For information about Conditional Access and Teams, see [Overview of security an
101101

102102
Currently, B2B direct connect enables the Teams Connect shared channels feature. B2B direct connect users can access an external organization's Teams shared channel without having to switch tenants or sign in with a different account. The B2B direct connect user’s access is determined by the shared channel’s policies.
103103

104-
In the resource organization, the Teams shared channel owner can search within Teams for users from an external organization and add them to the shared channel. After they're added, the B2B direct connect users can access the shared channel from within their home instance of Teams, where they collaborate using features such as chat, calls, file-sharing, and app-sharing. For details, see [Overview of teams and channels in Microsoft Teams](/microsoftteams/teams-channels-overview).For details about the resources, files, and applications, that are available to the B2B direct connect user via the Teams shared channel, refer to [Chat, teams, channels, & apps in Microsoft Teams](/microsoftteams/deploy-chat-teams-channels-microsoft-teams-landing-page).
104+
In the resource organization, the Teams shared channel owner can search within Teams for users from an external organization and add them to the shared channel. After they're added, the B2B direct connect users can access the shared channel from within their home instance of Teams, where they collaborate using features such as chat, calls, file-sharing, and app-sharing. For details, see [Overview of teams and channels in Microsoft Teams](/microsoftteams/teams-channels-overview). For details about the resources, files, and applications, that are available to the B2B direct connect user via the Teams shared channel, refer to [Chat, teams, channels, & apps in Microsoft Teams](/microsoftteams/deploy-chat-teams-channels-microsoft-teams-landing-page).
105105

106106
## B2B direct connect vs. B2B collaboration
107107

articles/active-directory/external-identities/redemption-experience.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ When a user clicks the **Accept invitation** link in an [invitation email](invit
8181

8282
![Screenshot showing the redemption flow diagram](media/redemption-experience/invitation-redemption-flow.png)
8383

84-
**If the user’s User Principal Name (UPN) matches with both an existing Azure AD and personal MSA account, the user will be prompted to choose which account they want to redeem with.*
84+
**If the user’s User Principal Name (UPN) matches with both an existing Azure AD and personal MSA account, the user will be prompted to choose which account they want to redeem with. If Email OTP is enabled, existing unmanaged "viral" Azure AD accounts will be ignored (See step #9).*
8585

8686
1. Azure AD performs user-based discovery to determine if the user exists in an [existing Azure AD tenant](./what-is-b2b.md#easily-invite-guest-users-from-the-azure-ad-portal).
8787

@@ -137,4 +137,4 @@ If you see an error that requires admin consent while accessing an application,
137137
- [Add Azure Active Directory B2B collaboration users in the Azure portal](add-users-administrator.md)
138138
- [How do information workers add B2B collaboration users to Azure Active Directory?](add-users-information-worker.md)
139139
- [Add Azure Active Directory B2B collaboration users by using PowerShell](customize-invitation-api.md#powershell)
140-
- [Leave an organization as a guest user](leave-the-organization.md)
140+
- [Leave an organization as a guest user](leave-the-organization.md)

articles/peering-service/location-partners.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The table in this article provides information on the Peering Service connectivi
2424

2525
| **Partners** | **Market**|
2626
|-----------|---------|
27-
| [Lumen Technologies](https://www.ctl.io/microsoft-azure-peering-services/) |North America, Europe|
27+
| [Lumen Technologies](https://www.ctl.io/microsoft-azure-peering-services/) |North America, Europe, Asia|
2828
| [BBIX](https://www.bbix.net/en/service/) |Japan |
2929
| [CCL](https://concepts.co.nz/news/general-news/) |Oceania |
3030
| [Colt](https://www.colt.net/why-colt/strategic-alliances/microsoft-partnership/)|Europe, Asia|
@@ -41,8 +41,12 @@ The table in this article provides information on the Peering Service connectivi
4141
| [CMC Networks](https://www.cmcnetworks.net/products/microsoft-azure-peering-services.html) |Africa|
4242
| [MainOne](https://www.mainone.net/connectivity-services/) |Africa|
4343
| [BICS](https://www.bics.com/services/capacity-solutions/cloud-connect/microsoft-azure-cloud-connect/) |Europe|
44-
| [Telstra International](https://www.telstra.com.sg/en/products/global-networks/global-internet/global-internet-direct) |Asia |
44+
| [Telstra International](https://www.telstra.com.sg/en/products/global-networks/global-internet/global-internet-direct) |Asia, Europe |
4545
| [Atman](https://www.atman.pl/en/atman-internet-maps/) |Europe|
46+
| [LINX](https://www.linx.net/services/microsoft-azure-peering/) |Europe|
47+
| [Converge ICT](https://www.convergeict.com/enterprise/microsoft-azure-peering-service-maps/) |Asia|
48+
49+
4650

4751
> [!NOTE]
4852
>For more information about enlisting with the Peering Service Partner program, reach out to [email protected].

articles/web-application-firewall/ag/application-gateway-crs-rulegroups-rules.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ The following rule groups and rules are available when using Web Application Fir
131131
### <a name="general-32"></a> General
132132
|RuleId|Description|
133133
|---|---|
134+
|200002|Failed to Parse Request Body.|
135+
|200003|Multipart Request Body Strict Validation.|
134136
|200004|Possible Multipart Unmatched Boundary.|
135137

136138
### <a name="crs800-32"></a> KNOWN-CVES

0 commit comments

Comments
 (0)