Skip to content

Commit 19949cb

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/logstash-change
2 parents 3e4b302 + 7fd7aff commit 19949cb

File tree

567 files changed

+9351
-5271
lines changed

Some content is hidden

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

567 files changed

+9351
-5271
lines changed

.openpublishing.redirection.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
{
1919
"source_path": "articles/virtual-machines/windows/nested-virtualization.md",
20-
"redirect_url": "/previous-versions/azure/virtual-machines/windows/nested-virtualization",
20+
"redirect_url": "https://docs.microsoft.com/virtualization/hyper-v-on-windows/user-guide/nested-virtualization",
2121
"redirect_document_id": false
2222
},
2323
{
@@ -13286,7 +13286,12 @@
1328613286
},
1328713287
{
1328813288
"source_path_from_root": "/articles/virtual-machines/workloads/sap/baremetal-infrastructure-portal.md",
13289-
"redirect_url": "/azure/baremetal-infrastructure/workloads/sap/baremetal-infrastructure-portal",
13289+
"redirect_url": "/azure/baremetal-infrastructure/connect-baremetal-infrastructure",
13290+
"redirect_document_id": false
13291+
},
13292+
{
13293+
"source_path_from_root": "/articles/baremetal-infrastructure/baremetal-overview-architecture.md",
13294+
"redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
1329013295
"redirect_document_id": false
1329113296
},
1329213297
{
@@ -46140,6 +46145,11 @@
4614046145
"redirect_url": "agent-based-migration-architecture",
4614146146
"redirect_document_id": false
4614246147
},
46148+
{
46149+
"source_path_from_root": "/articles/migrate/tutorial-containerize-aspnet-kubernetes.md",
46150+
"redirect_url": "tutorial-app-containerization-aspnet-kubernetes",
46151+
"redirect_document_id": false
46152+
},
4614346153
{
4614446154
"source_path_from_root": "/articles/storage/common/storage-access-blobs-queues-portal.md",
4614546155
"redirect_url": "articles/storage/blobs/authorize-blob-access-portal",
@@ -53540,6 +53550,11 @@
5354053550
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
5354153551
"redirect_document_id": false
5354253552
},
53553+
{
53554+
"source_path_from_root": "/articles/active-directory/manage-apps/non-gallery-apps.md",
53555+
"redirect_url": "/azure/active-directory/manage-apps/plan-an-application-integration",
53556+
"redirect_document_id": false
53557+
},
5354353558
{
5354453559
"source_path_from_root": "/articles/active-directory/application-provisioning-config-problem-wrong-users-provisioned.md",
5354553560
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal-assign-users",
@@ -63400,6 +63415,11 @@
6340063415
"redirect_url": "/azure/communication-services/concepts/teams-interop",
6340163416
"redirect_document_id": false
6340263417
},
63418+
{
63419+
"source_path_from_root": "/articles/communication-services/concepts/event-handling.md",
63420+
"redirect_url": "/azure/event-grid/event-schema-communication-services",
63421+
"redirect_document_id": false
63422+
},
6340363423
{
6340463424
"source_path_from_root": "/articles/azure-monitor/app/change-analysis.md#visualizations-for-application-change-analysis",
6340563425
"redirect_url": "/articles/azure-monitor/app/change-analysis-visualizations",
@@ -64493,6 +64513,11 @@
6449364513
"source_path": "articles/azure-monitor/app/visual-studio-trends.md",
6449464514
"redirect_url": "/azure/azure-monitor/app/visual-studio",
6449564515
"redirect_document_id": false
64516+
},
64517+
{
64518+
"source_path_from_root": "/articles/cognitive-services/translator/custom-translator/glossary.md",
64519+
"redirect_url": "/azure/cognitive-services/translator/custom-translator/terminology",
64520+
"redirect_document_id": false
6449664521
}
6449764522
]
6449864523
}

articles/active-directory-b2c/embedded-login.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,25 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 03/16/2021
12+
ms.date: 03/21/2021
1313
ms.custom: project-no-code
1414
ms.author: mimart
1515
ms.subservice: B2C
16+
zone_pivot_groups: b2c-policy-type
1617
---
1718

1819
# Embedded sign-in experience
1920

21+
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
22+
23+
::: zone pivot="b2c-user-flow"
24+
25+
[!INCLUDE [active-directory-b2c-limited-to-custom-policy](../../includes/active-directory-b2c-limited-to-custom-policy.md)]
26+
27+
::: zone-end
28+
29+
::: zone pivot="b2c-custom-policy"
30+
2031
For a simpler sign-in experience, you can avoid redirecting users to a separate sign-in page or generating a pop-up window. By using the inline frame element `<iframe>`, you can embed the Azure AD B2C sign-in user interface directly into your web application.
2132

2233
[!INCLUDE [b2c-public-preview-feature](../../includes/active-directory-b2c-public-preview.md)]
@@ -153,4 +164,6 @@ See the following related articles:
153164
- [User interface customization](customize-ui.md)
154165
- [RelyingParty](relyingparty.md) element reference
155166
- [Enable your policy for JavaScript](./javascript-and-page-layout.md)
156-
- [Code samples](code-samples.md)
167+
- [Code samples](code-samples.md)
168+
169+
::: zone-end

articles/active-directory/authentication/howto-authentication-temporary-access-pass.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ Keep these limitations in mind:
129129
- Guest users can't sign in with a Temporary Access Pass.
130130
- Users in scope for Self Service Password Reset (SSPR) registration policy will be required to register one of the SSPR methods after they have signed in with a Temporary Access Pass. If the user is only going to use FIDO2 key, exclude them from the SSPR policy or disable the SSPR registration policy.
131131
- A Temporary Access Pass cannot be used with the Network Policy Server (NPS) extension and Active Directory Federation Services (AD FS) adapter.
132-
- Federated users using [Alternate Login ID](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/configuring-alternate-login-id) are not offered to use a Temporary Access Pass, instead the user will get redirected to the federated IdP. When using a UPN in Azure AD, the user will be able to sign-in with a Temporary Access Pass without a redirect to the federated IdP.
133132
- When Seamless SSO is enabled on the tenant, the users are prompted to enter a password. The **Use your Temporary Access Pass instead** link will be available for the user to sign-in with a Temporary Access Pass.
134133

135134
![Screenshot of Use a Temporary Access Pass instead](./media/how-to-authentication-temporary-access-pass/alternative.png)

0 commit comments

Comments
 (0)