Skip to content

Commit 0a49a55

Browse files
Merge branch 'main' into patch-40
2 parents c3ac121 + 77d5f04 commit 0a49a55

File tree

556 files changed

+4970
-4947
lines changed

Some content is hidden

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

556 files changed

+4970
-4947
lines changed

.openpublishing.redirection.json

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22629,6 +22629,41 @@
2262922629
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
2263022630
"redirect_document_id": true
2263122631
},
22632+
{
22633+
"source_path_from_root": "/articles/scheduler/scheduler-advanced-complexity.md",
22634+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22635+
"redirect_document_id": ""
22636+
},
22637+
{
22638+
"source_path_from_root": "/articles/scheduler/scheduler-concepts-terms.md",
22639+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22640+
"redirect_document_id": ""
22641+
},
22642+
{
22643+
"source_path_from_root": "/articles/scheduler/scheduler-powershell-reference.md",
22644+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22645+
"redirect_document_id": ""
22646+
},
22647+
{
22648+
"source_path_from_root": "/articles/scheduler/scheduler-plans-billing.md",
22649+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22650+
"redirect_document_id": ""
22651+
},
22652+
{
22653+
"source_path_from_root": "/articles/scheduler/scheduler-limits-defaults-errors.md",
22654+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22655+
"redirect_document_id": ""
22656+
},
22657+
{
22658+
"source_path_from_root": "/articles/scheduler/scheduler-high-availability-reliability.md",
22659+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22660+
"redirect_document_id": ""
22661+
},
22662+
{
22663+
"source_path_from_root": "/articles/scheduler/scheduler-outbound-authentication.md",
22664+
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
22665+
"redirect_document_id": ""
22666+
},
2263222667
{
2263322668
"source_path_from_root": "/articles/scheduler/get-started-portal.md",
2263422669
"redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
@@ -26254,9 +26289,19 @@
2625426289
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
2625526290
"redirect_document_id": false
2625626291
},
26292+
{
26293+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-legacy.md",
26294+
"redirect_url": "/azure/storage/blobs/quickstart-blobs-javascript-browser",
26295+
"redirect_document_id": false
26296+
},
26297+
{
26298+
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-legacy.md",
26299+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
26300+
"redirect_document_id": false
26301+
},
2625726302
{
2625826303
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-v10.md",
26259-
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs-legacy",
26304+
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
2626026305
"redirect_document_id": false
2626126306
},
2626226307
{

.openpublishing.redirection.media-services.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,11 @@
624624
"source_path_from_root": "/articles/media-services/latest/security-private-link-how-to.md",
625625
"redirect_url": "/azure/media-services/latest/security-private-link-arm-how-to",
626626
"redirect_document_id": false
627+
},
628+
{
629+
"source_path_from_root": "/articles/media-services/latest/asset-create-asset-upload-portal-quickstart.md",
630+
"redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",
631+
"redirect_document_id": true
627632
},
628633
{
629634
"source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",

articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
1717
---
1818
# Enable passwordless security key sign-in to on-premises resources by using Azure AD
1919

20-
This document discusses how to enable passwordless authentication to on-premises resources for environments with both *Azure Active Directory (Azure AD)-joined* and *hybrid Azure AD-joined* Windows 10 devices. This passwordless authentication functionality provides seamless single sign-on (SSO) to on-premises resources when you use Microsoft-compatible security keys.
20+
This document discusses how to enable passwordless authentication to on-premises resources for environments with both *Azure Active Directory (Azure AD)-joined* and *hybrid Azure AD-joined* Windows 10 devices. This passwordless authentication functionality provides seamless single sign-on (SSO) to on-premises resources when you use Microsoft-compatible security keys, or with [Windows Hello for Business Cloud trust](/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-trust.md)
2121

2222
## Use SSO to sign in to on-premises resources by using FIDO2 keys
2323

@@ -44,11 +44,6 @@ You must also meet the following system requirements:
4444

4545
- Devices must be running Windows 10 version 2004 or later.
4646

47-
- You must be running [Azure AD Connect version 1.4.32.0 or later](../hybrid/how-to-connect-install-roadmap.md#install-azure-ad-connect).
48-
- For more information about the available Azure AD hybrid authentication options, see the following articles:
49-
- [Choose the right authentication method for your Azure AD hybrid identity solution](../hybrid/choose-ad-authn.md)
50-
- [Select which installation type to use for Azure AD Connect](../hybrid/how-to-connect-install-select-installation.md)
51-
5247
- Your Windows Server domain controllers must have patches installed for the following servers:
5348
- [Windows Server 2016](https://support.microsoft.com/help/4534307/windows-10-update-kb4534307)
5449
- [Windows Server 2019](https://support.microsoft.com/help/4534321/windows-10-update-kb4534321)

articles/active-directory/develop/active-directory-saml-claims-customization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ You can use the following functions to transform claims.
121121
| Function | Description |
122122
|----------|-------------|
123123
| **ExtractMailPrefix()** | Removes the domain suffix from either the email address or the user principal name. This extracts only the first part of the user name being passed through (for example, "joe_smith" instead of [email protected]). |
124-
| **Join()** | Creates a new value by joining two attributes. Optionally, you can use a separator between the two attributes. |
124+
| **Join()** | Creates a new value by joining two attributes. Optionally, you can use a separator between the two attributes. For NameID claim transformation, the Join() function has specific behaviour when the transformation input has a domain part. It will remove the domain part from input before joining it with the separator and the selected parameter. For example, if the input of the transformation is ‘[email protected]’ and the separator is ‘@’ and the parameter is ‘fabrikam.com’, this will result in [email protected]. |
125125
| **ToLowercase()** | Converts the characters of the selected attribute into lowercase characters. |
126126
| **ToUppercase()** | Converts the characters of the selected attribute into uppercase characters. |
127127
| **Contains()** | Outputs an attribute or constant if the input matches the specified value. Otherwise, you can specify another output if there’s no match.<br/>For example, if you want to emit a claim where the value is the user’s email address if it contains the domain “@contoso.com”, otherwise you want to output the user principal name. To do this, you would configure the following values:<br/>*Parameter 1(input)*: user.email<br/>*Value*: "@contoso.com"<br/>Parameter 2 (output): user.email<br/>Parameter 3 (output if there's no match): user.userprincipalname |

0 commit comments

Comments
 (0)