Skip to content

Commit 58ea07e

Browse files
authored
Merge pull request #231576 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 fbdfcd7 + 8bb93f3 commit 58ea07e

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

articles/active-directory/cloud-sync/tutorial-pilot-aadc-aadccp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The following are prerequisites required for completing this tutorial
5757
As a minimum, you should have [Azure AD connect](https://www.microsoft.com/download/details.aspx?id=47594) 1.4.32.0. To update Azure AD Connect sync, complete the steps in [Azure AD Connect: Upgrade to the latest version](../hybrid/how-to-upgrade-previous-version.md).
5858

5959
## Back up your Azure AD Connect configuration
60-
Before making any changes, you should back up your Azure AD Connect configuration. This way, you can role-back. See [Import and export Azure AD Connect configuration settings](../hybrid/how-to-connect-import-export-config.md) for more information.
60+
Before making any changes, you should back up your Azure AD Connect configuration. This way, you can roll back to your previous configuration. See [Import and export Azure AD Connect configuration settings](../hybrid/how-to-connect-import-export-config.md) for more information.
6161

6262
## Stop the scheduler
6363

articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ A persistent browser session allows users to remain signed in after closing and
111111

112112
The Azure AD default for browser session persistence allows users on personal devices to choose whether to persist the session by showing a “Stay signed in?” prompt after successful authentication. If browser persistence is configured in AD FS using the guidance in the article [AD FS single sign-on settings](/windows-server/identity/ad-fs/operations/ad-fs-single-sign-on-settings#enable-psso-for-office-365-users-to-access-sharepoint-online), we'll comply with that policy and persist the Azure AD session as well. You can also configure whether users in your tenant see the “Stay signed in?” prompt by changing the appropriate setting in the [company branding pane](../fundamentals/customize-branding.md).
113113

114+
In persistent browsers, cookies stay stored in the user’s device even after a user closes the browser. These cookies could have access to Azure Active Directory artifacts, and those artifacts are useable until token expiry regardless of the Conditional Access policies placed on the resource environment. So, token caching can be in direct violation of desired security policies for authentication. While it may seem convenient to store tokens beyond the current session, doing so can create a security vulnerability by allowing unauthorized access to Azure Active Directory artifacts.
115+
114116
## Configuring authentication session controls
115117

116118
Conditional Access is an Azure AD Premium capability and requires a premium license. If you would like to learn more about Conditional Access, see [What is Conditional Access in Azure Active Directory?](overview.md#license-requirements)
@@ -196,4 +198,4 @@ We factor for five minutes of clock skew, so that we don’t prompt users more o
196198

197199
## Next steps
198200

199-
* If you're ready to configure Conditional Access policies for your environment, see the article [Plan a Conditional Access deployment](plan-conditional-access.md).
201+
* If you're ready to configure Conditional Access policies for your environment, see the article [Plan a Conditional Access deployment](plan-conditional-access.md).

articles/active-directory/hybrid/tutorial-password-hash-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Before you install Windows Server AD, run a script that installs prerequisites:
113113
$ipprefix = "24"
114114
$ipgw = "10.0.1.1"
115115
$ipdns = "10.0.1.117"
116-
$ipdns2 = "8.8.8.8"
116+
$ipdns2 = "4.2.2.2"
117117
$ipif = (Get-NetAdapter).ifIndex
118118
$featureLogPath = "c:\poshlog\featurelog.txt"
119119
$newname = "DC1"

articles/active-directory/roles/delegate-app-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ By default in Azure AD, all users can register applications and manage all aspec
4343

4444
### Grant individual permissions to create and consent to applications when the default ability is disabled
4545

46-
Assign the Application Developer role to grant the ability to create application registrations when the **Users can register applications** setting is set to No. This role also grants permission to consent on one's own behalf when the **Users can consent to apps accessing company data on their behalf** setting is set to No.
46+
Assign the [Application Developer role](../roles/permissions-reference.md#application-developer) to grant the ability to create application registrations when the **Users can register applications** setting is set to No. This role also grants permission to consent on one's own behalf when the **Users can consent to apps accessing company data on their behalf** setting is set to No.
4747

4848
## Assign application owners
4949

articles/active-directory/verifiable-credentials/presentation-request-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Authorization: Bearer <token>
5252
{
5353
    "includeQRCode": true,
5454
"callback": {
55-
      "url": "https://www.contoso.com/api/verifier/presentationCallbac",
55+
      "url": "https://www.contoso.com/api/verifier/presentationCallback",
5656
      "state": "11111111-2222-2222-2222-333333333333",
5757
      "headers": {
5858
        "api-key": "an-api-key-can-go-here"

articles/mariadb/quickstart-create-mariadb-server-database-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Quickstart: Create an Azure DB for MariaDB - Bicep'
2+
title: 'Quickstart: Create an Azure Database for MariaDB - Bicep'
33
description: In this Quickstart article, learn how to create an Azure Database for MariaDB server using Bicep.
44
author: rothja
55
ms.author: jroth

0 commit comments

Comments
 (0)