Skip to content

Commit a415419

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 1dbf6fa + 66b6e64 commit a415419

File tree

235 files changed

+1864
-752
lines changed

Some content is hidden

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

235 files changed

+1864
-752
lines changed

.openpublishing.redirection.json

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46923,7 +46923,77 @@
4692346923
},
4692446924
{
4692546925
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/sip-interface-infrastructure.md",
46926-
"redirect_url": "/azure/communication-services/concepts/telephony-sms/direct-routing-infrastructure",
46926+
"redirect_url": "/azure/communication-services/concepts/telephony/direct-routing-infrastructure",
46927+
"redirect_document_id": false
46928+
},
46929+
{
46930+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/direct-routing-infrastructure.md",
46931+
"redirect_url": "/azure/communication-services/concepts/telephony/direct-routing-infrastructure",
46932+
"redirect_document_id": false
46933+
},
46934+
{
46935+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/certified-session-border-controllers.md",
46936+
"redirect_url": "/azure/communication-services/concepts/telephony/certified-session-border-controllers",
46937+
"redirect_document_id": false
46938+
},
46939+
{
46940+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/direct-routing-provisioning.md",
46941+
"redirect_url": "/azure/communication-services/concepts/telephony/direct-routing-provisioning",
46942+
"redirect_document_id": false
46943+
},
46944+
{
46945+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/plan-solution.md",
46946+
"redirect_url": "/azure/communication-services/concepts/telephony/plan-solution",
46947+
"redirect_document_id": false
46948+
},
46949+
{
46950+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/telephony-concept.md",
46951+
"redirect_url": "/azure/communication-services/concepts/telephony/telephony-concept",
46952+
"redirect_document_id": false
46953+
},
46954+
{
46955+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/get-phone-number.md",
46956+
"redirect_url": "/azure/communication-services/concepts/telephony/get-phone-number",
46957+
"redirect_document_id": false
46958+
},
46959+
{
46960+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/port-phone-number.md",
46961+
"redirect_url": "/azure/communication-services/concepts/telephony/port-phone-number",
46962+
"redirect_document_id": false
46963+
},
46964+
{
46965+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/concepts.md",
46966+
"redirect_url": "/azure/communication-services/concepts/sms/concepts",
46967+
"redirect_document_id": false
46968+
},
46969+
{
46970+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/messaging-policy.md",
46971+
"redirect_url": "/azure/communication-services/concepts/sms/messaging-policy",
46972+
"redirect_document_id": false
46973+
},
46974+
{
46975+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/sdk-features.md",
46976+
"redirect_url": "/azure/communication-services/concepts/sms/sdk-features",
46977+
"redirect_document_id": false
46978+
},
46979+
{
46980+
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/sms-faq.md",
46981+
"redirect_url": "/azure/communication-services/concepts/sms/sms-faq",
46982+
"redirect_document_id": false
46983+
},
46984+
{
46985+
"source_path_from_root": "/articles/communication-services/quickstarts/telephony-sms/handle-sms-events.md",
46986+
"redirect_url": "/azure/communication-services/quickstarts/sms/handle-sms-events",
46987+
"redirect_document_id": false
46988+
},
46989+
{
46990+
"source_path_from_root": "/articles/communication-services/quickstarts/telephony-sms/logic-app.md",
46991+
"redirect_url": "/azure/communication-services/quickstarts/sms/logic-app",
46992+
"redirect_document_id": false
46993+
},
46994+
{
46995+
"source_path_from_root": "/articles/communication-services/quickstarts/telephony-sms/send.md",
46996+
"redirect_url": "/azure/communication-services/quickstarts/sms/send",
4692746997
"redirect_document_id": false
4692846998
},
4692946999
{

articles/active-directory/external-identities/conditional-access.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: B2B
88
ms.topic: conceptual
9-
ms.date: 01/21/2020
9+
ms.date: 11/30/2021
1010

1111
ms.author: mimart
1212
author: msmimart
@@ -69,18 +69,6 @@ The resource tenant is always responsible for Azure AD Multi-Factor Authenticati
6969
>[!NOTE]
7070
>Azure AD Multi-Factor Authentication is done at resource tenancy to ensure predictability. When the guest user signs in, they'll see the resource tenant sign-in page displayed in the background, and their own home tenant sign-in page and company logo in the foreground.
7171
72-
### Set up Azure AD Multi-Factor Authentication for B2B users
73-
74-
To set up Azure AD Multi-Factor Authentication for B2B collaboration users, watch this video:
75-
76-
>[!VIDEO https://channel9.msdn.com/Blogs/Azure/b2b-conditional-access-setup/Player]
77-
78-
### B2B users Azure AD Multi-Factor Authentication for offer redemption
79-
80-
To learn more about the Azure AD Multi-Factor Authentication redemption experience, watch this video:
81-
82-
>[!VIDEO https://channel9.msdn.com/Blogs/Azure/MFA-redemption/Player]
83-
8472
### Azure AD Multi-Factor Authentication reset for B2B users
8573

8674
Now, the following PowerShell cmdlets are available to proof up B2B guest users:
@@ -118,7 +106,8 @@ There are various factors that influence CA policies for B2B guest users.
118106
In CA, there's an option to require a user’s [device to be Compliant or Hybrid Azure AD joined](../conditional-access/concept-conditional-access-conditions.md#device-state-preview). B2B guest users can only satisfy compliance if the resource tenant can manage their device. Devices cannot be managed by more than one organization at a time. B2B guest users can't satisfy the Hybrid Azure AD join because they don't have an on-premises AD account.
119107

120108
>[!Note]
121-
>It is not recommended to require a managed device for external users.
109+
>- It is not recommended to require a managed device for external users.
110+
>- When guest users try to access a resource protected by Conditional Access, they'll no longer be asked to re-register their devices in your tenant. Previously, guest users would be able to start the re-registration process. However, this would remove their existing device registration, and they'd be unable to complete registration. Now, they'll see a Conditional Access blocking page to prevent them from trying to re-register their devices.
122111
123112
### Mobile application management policies
124113

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Required permissions | For permissions required to apply an update, see [account
6363
> [!NOTE]
6464
> This is an update release of Azure AD Connect. This version is intended to be used by customers who are running an older version of Windows Server and cannot upgrade their server to Windows Server 2016 or newer at this time. You cannot use this version to update an Azure AD Connect V2.0 server.
6565
>
66-
> This release is not supported on Windows Server 2016 or newer. This release includes SQL Server 2012 components and will be retired on August 31st 2022. You will need to upgrade your Server OS and AADConnect version before that date.
66+
> This release should not be installed on Windows Server 2016 or newer. This release includes SQL Server 2012 components and will be retired on August 31st 2022. You will need to upgrade your Server OS and AADConnect version before that date.
6767
>
6868
> There is an issue where upgrading to this v1.6 build or any newer builds resets the group membership limit to 50k. When a server is upgraded to this build, or any newer 1.6 builds, then the customer should reapply the rules changes they applied when initially increasing the group membership limit to 250k before they enable sync for the server.
6969

articles/active-directory/saas-apps/github-enterprise-managed-user-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.author: thwimmer
2323
This tutorial describes the steps you need to perform in both GitHub Enterprise Managed User and Azure Active Directory (Azure AD) to configure automatic user provisioning. When configured, Azure AD automatically provisions and de-provisions users and groups to GitHub Enterprise Managed User using the Azure AD Provisioning service. For important details on what this service does, how it works, and frequently asked questions, see [Automate user provisioning and deprovisioning to SaaS applications with Azure Active Directory](../app-provisioning/user-provisioning.md).
2424

2525
> [!NOTE]
26-
> [GitHub Enterprise Managed Users](https://docs.github.com/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users) is a feature of GitHub Enterprise Cloud which is different from GitHub Enterprise's standard SAML SSO and user provisioning implementation. If you haven't specifically requested EMU instance, you have standard GitHub Enterprise Cloud plan. In that case, please refer to [the documentation](https://docs.microsoft.com/azure/active-directory/saas-apps/github-provisioning-tutorial) to configure user provisioning in your non-EMU organisation. User provisioning is not supported for [GitHub Enteprise Accounts](https://docs.github.com/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)
26+
> [GitHub Enterprise Managed Users](https://docs.github.com/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users) is a feature of GitHub Enterprise Cloud which is different from GitHub Enterprise's standard SAML SSO and user provisioning implementation. If you haven't specifically requested EMU instance, you have standard GitHub Enterprise Cloud plan. In that case, please refer to [the documentation](https://docs.microsoft.com/azure/active-directory/saas-apps/github-provisioning-tutorial) to configure user provisioning in your non-EMU organisation. User provisioning is not supported for [GitHub Enteprise Accounts](https://docs.github.com/enterprise-cloud@latest/admin/overview/about-enterprise-accounts)
2727
2828
## Capabilities Supported
2929
> [!div class="checklist"]

articles/active-directory/saas-apps/github-enterprise-managed-user-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ In this tutorial, you'll learn how to integrate GitHub Enterprise Managed User (
2222
* Enable your users to be automatically signed-in to GitHub Enterprise Managed User with their Azure AD accounts.
2323
* Manage your accounts in one central location - the Azure portal.
2424

25-
> [!NOTE]
26-
> [GitHub Enterprise Managed Users](https://docs.github.com/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users) is a feature of GitHub Enterprise Cloud which is different from GitHub Enterprise's standard SAML SSO implementation. If you haven't specifically requested EMU instance, you have standard GitHub Enterprise Cloud plan. In that case, please refer to relevant documentation to configure your non-EMU [organisation](https://docs.microsoft.com/azure/active-directory/saas-apps/github-tutorial) or [enterprise account](https://docs.microsoft.com/azure/active-directory/saas-apps/github-enterprise-cloud-enterprise-account-tutorial) to authenticate with Azure Active Directory.
25+
> [!NOTE]
26+
> [GitHub Enterprise Managed Users](https://docs.github.com/enterprise-cloud@latest/admin/authentication/managing-your-enterprise-users-with-your-identity-provider/about-enterprise-managed-users) is a feature of GitHub Enterprise Cloud which is different from GitHub Enterprise's standard SAML SSO implementation. If you haven't specifically requested EMU instance, you have standard GitHub Enterprise Cloud plan. In that case, please refer to relevant documentation to configure your non-EMU [organisation](https://docs.microsoft.com/azure/active-directory/saas-apps/github-tutorial) or [enterprise account](https://docs.microsoft.com/azure/active-directory/saas-apps/github-enterprise-cloud-enterprise-account-tutorial) to authenticate with Azure Active Directory.
2727
2828

2929
## Prerequisites

0 commit comments

Comments
 (0)