Skip to content

Commit dc1d45c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into jammart-abac-storage-move-common-to-blobs
2 parents dd4246f + 58e8b7b commit dc1d45c

File tree

130 files changed

+1432
-938
lines changed

Some content is hidden

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

130 files changed

+1432
-938
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10845,8 +10845,12 @@
1084510845
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
1084610846
"redirect_url": "/azure/azure-percept/index",
1084710847
"redirect_document_id": false
10848+
},
10849+
{
10850+
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10851+
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10852+
"redirect_document_id": false
1084810853
}
1084910854

10850-
1085110855
]
1085210856
}

articles/active-directory-b2c/enable-authentication-web-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ Under the project root folder, create a *config.json* file, and then add to it t
443443
```json
444444
{
445445
"credentials": {
446-
"tenantName": "<your-tenant-name>",
446+
"tenantName": "<your-tenant-name>.onmicrosoft.com",
447447
"clientID": "<your-webapi-application-ID>",
448448
"issuer": "https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/"
449449
},
@@ -470,7 +470,7 @@ In the *config.json* file, update the following properties:
470470

471471
|Section |Key |Value |
472472
|---------|---------|---------|
473-
| credentials | tenantName | The first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name) (for example, `contoso`).|
473+
| credentials | tenantName | Your Azure AD B2C [tenant name/domain name](tenant-management.md#get-your-tenant-name) (for example, `contoso.onmicrosoft.com`).|
474474
| credentials |clientID | The web API application ID. In the [preceding diagram](#app-registration-overview), it's the application with *App ID: 2*. To learn how to get your web API application registration ID, see [Prerequisites](#prerequisites). |
475475
| credentials | issuer| The token issuer `iss` claim value. By default, Azure AD B2C returns the token in the following format: `https://<your-tenant-name>.b2clogin.com/<your-tenant-ID>/v2.0/`. Replace `<your-tenant-name>` with the first part of your Azure AD B2C [tenant name](tenant-management.md#get-your-tenant-name). Replace `<your-tenant-ID>` with your [Azure AD B2C tenant ID](tenant-management.md#get-your-tenant-id). |
476476
| policies | policyName | The user flows, or custom policy. To learn how to get your user flow or policy, see [Prerequisites](#prerequisites).|

articles/active-directory/authentication/concepts-azure-multi-factor-authentication-prompts-session-lifetime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ When a user selects **Yes** on the *Stay signed in?* option during sign-in, a pe
6868

6969
If you have an Azure AD Premium 1 license, we recommend using Conditional Access policy for *Persistent browser session*. This policy overwrites the *Stay signed in?* setting and provides an improved user experience. If you don't have an Azure AD Premium 1 license, we recommend enabling the stay signed in setting for your users.
7070

71-
For more information on configuring the option to let users remain signed-in, see [Customize your Azure AD sign-in page](../fundamentals/customize-branding.md#customize-your-azure-ad-sign-in-page).
71+
For more information on configuring the option to let users remain signed-in, see [Customize your Azure AD sign-in page](../fundamentals/customize-branding.md#learn-about-the-stay-signed-in-prompt).
7272

7373
### Remember Multi-Factor Authentication
7474

articles/active-directory/fundamentals/customize-branding.md

Lines changed: 90 additions & 75 deletions
Large diffs are not rendered by default.

articles/active-directory/fundamentals/keep-me-signed-in.md

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)