Skip to content

Commit 8baa749

Browse files
authored
Merge pull request #97000 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 020962d + 0b5ce6d commit 8baa749

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

articles/machine-learning/service/how-to-deploy-azure-kubernetes-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ For more information, see the [az ml computetarget create ask](https://docs.micr
113113
If you already have AKS cluster in your Azure subscription, and it is lower than version 1.14, you can use it to deploy your image.
114114

115115
> [!TIP]
116-
> The existing AKS cluster can be in a Azure region than your Azure Machine Learning workspace.
116+
> The existing AKS cluster can be in a Azure region other than your Azure Machine Learning workspace.
117117
>
118118
> If you want to secure your AKS cluster using an Azure Virtual Network, you must create the virtual network first. For more information, see [Secure experimentation and inference with Azure Virtual Network](how-to-enable-virtual-network.md#aksvnet).
119119

articles/search/cognitive-search-custom-skill-web-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,4 @@ For cases when the Web API is unavailable or returns a HTTP error, a friendly er
201201

202202
+ [How to define a skillset](cognitive-search-defining-skillset.md)
203203
+ [Add custom skill to an AI enrichment pipeline](cognitive-search-custom-skill-interface.md)
204-
+ [Example: Creating a custom skill for AI enrichment(cognitive-search-create-custom-skill-example.md)
204+
+ [Example: Creating a custom skill for AI enrichment](cognitive-search-create-custom-skill-example.md)

articles/security/fundamentals/choose-ad-authn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ The following diagrams outline the high-level architecture components required f
179179
|What are the Conditional Access options?|[Azure AD Conditional Access, with Azure AD Premium](../../active-directory/conditional-access/overview.md)|[Azure AD Conditional Access, with Azure AD Premium](../../active-directory/conditional-access/overview.md)|[Azure AD Conditional Access, with Azure AD Premium](../../active-directory/conditional-access/overview.md)<br><br>[AD FS claim rules](https://adfshelp.microsoft.com/AadTrustClaims/ClaimsGenerator)|
180180
|Is blocking legacy protocols supported?|[Yes](../../active-directory/conditional-access/conditions.md)|[Yes](../../active-directory/conditional-access/conditions.md)|[Yes](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/access-control-policies-w2k12)|
181181
|Can you customize the logo, image, and description on the sign-in pages?|[Yes, with Azure AD Premium](../../active-directory/fundamentals/customize-branding.md)|[Yes, with Azure AD Premium](../../active-directory/fundamentals/customize-branding.md)|[Yes](../../active-directory/hybrid/how-to-connect-fed-management.md)|
182-
|What advanced scenarios are supported?|[Smart password lockout](../../active-directory/authentication/concept-sspr-howitworks.md)<br><br>[Leaked credentials reports, with Azure AD Premium P2](../../active-directory/reports-monitoring/concept-risk-events.md)|[Smart password lockout](../../active-directory/authentication/howto-password-smart-lockout.md)|Multisite low-latency authentication system<br><br>[AD FS extranet lockout](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-soft-lockout-protection)<br><br>[Integration with third-party identity systems](../../active-directory/hybrid/how-to-connect-fed-compatibility.md)|
182+
|What advanced scenarios are supported?|[Smart password lockout](../../active-directory/authentication/howto-password-smart-lockout.md)<br><br>[Leaked credentials reports, with Azure AD Premium P2](../../active-directory/reports-monitoring/concept-risk-events.md)|[Smart password lockout](../../active-directory/authentication/howto-password-smart-lockout.md)|Multisite low-latency authentication system<br><br>[AD FS extranet lockout](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-soft-lockout-protection)<br><br>[Integration with third-party identity systems](../../active-directory/hybrid/how-to-connect-fed-compatibility.md)|
183183

184184
> [!NOTE]
185185
> Custom controls in Azure AD Conditional Access does not currently support device registration.

0 commit comments

Comments
 (0)