Skip to content

Commit 3119b65

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into saas-tutorials-jeevansd
2 parents a8f55e0 + bdf25b0 commit 3119b65

File tree

892 files changed

+5559
-15353
lines changed

Some content is hidden

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

892 files changed

+5559
-15353
lines changed

.openpublishing.redirection.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4680,6 +4680,12 @@
46804680
"redirect_url": "/azure/automation/source-control-integration",
46814681
"redirect_document_id": false
46824682
},
4683+
4684+
{
4685+
"source_path": "articles/automation/automation-credentials.md",
4686+
"redirect_url": "/azure/automation/shared-resources/credentials",
4687+
"redirect_document_id": false
4688+
},
46834689
{
46844690
"source_path": "articles/automation/automation-certificates.md",
46854691
"redirect_url": "/azure/automation/shared-resources/certificates",
@@ -10878,6 +10884,11 @@
1087810884
"redirect_url": "https://azure.microsoft.com/services/data-factory/",
1087910885
"redirect_document_id": false
1088010886
},
10887+
{
10888+
"source_path": "articles/hdinsight/hdinsight-hadoop-install-mono.md",
10889+
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-migrate-dotnet-to-linux",
10890+
"redirect_document_id": false
10891+
},
1088110892
{
1088210893
"source_path": "articles/hdinsight/hdinsight-hadoop-r-scripts.md",
1088310894
"redirect_url": "/azure/hdinsight/r-server/r-server-get-started",

articles/active-directory/authentication/concept-registration-mfa-sspr-combined.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Before combined registration, users registered authentication methods for Azure
2323

2424
Before enabling the new experience, review this administrator-focused documentation and the user-focused documentation to ensure you understand the functionality and effect of this feature. Base your training on the user documentation to prepare your users for the new experience and help to ensure a successful rollout.
2525

26+
Azure AD combined security information registration is not currently available to national clouds like Azure US Government, Azure Germany, or Azure China 21Vianet.
27+
2628
| |
2729
| --- |
2830
| Combined security information registration for Multi-Factor Authentication and Azure Active Directory (Azure AD) self-service password reset is a public preview feature of Azure AD. For more information about previews, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).|

articles/active-directory/authentication/howto-mfaserver-deploy-ha.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Both MFA master and subordinate MFA Servers communicate with the MFA Service whe
3333

3434
After successful authentication with AD, the MFA Server will communicate with the MFA Service. The MFA Server waits for notification from the MFA Service to allow or deny the user access to the application.
3535

36-
If the MFA master server goes offline, authentications can still be processed, but operations that require changes to the MFA database cannot be processed. (Examples include: the addition of users, self-service PIN changes, and changing user information)
36+
If the MFA master server goes offline, authentications can still be processed, but operations that require changes to the MFA database cannot be processed. (Examples include: the addition of users, self-service PIN changes, changing user information, or access to the user portal)
3737

3838
## Deployment
3939

articles/active-directory/develop/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,6 @@
371371
items:
372372
- name: Configure role claims
373373
href: active-directory-enterprise-app-role-management.md
374-
- name: Customize claims - Portal
375-
href: active-directory-saml-claims-customization.md
376374
- name: Customize claims - PowerShell
377375
href: active-directory-claims-mapping.md
378376
- name: Configure optional claims

articles/active-directory/develop/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
ms.date: 09/24/2018
1616
ms.author: celested
1717
abstract:
18-
description: Microsoft identity platform is an evolution of the Azure Active Directory (Azure AD) identity service and developer platform. It allows developers to build applications that sign in all Microsoft identities, get tokens to call Microsoft Graph, other Microsoft APIs, or APIs that developers have built. It’s a full-featured platform that consists of a authentication service, open-source libraries, application registration and configuration, full developer documentation, code samples, and other developer content. The Microsoft identity platform supports industry standard protocols such as OAuth 2.0 and OpenID Connect.
18+
description: Microsoft identity platform is an evolution of the Azure Active Directory (Azure AD) identity service and developer platform. It allows developers to build applications that sign in all Microsoft identities and get tokens to call Microsoft APIs such as Microsoft Graph or APIs that developers have built. It’s a full-featured platform that consists of an OAuth 2.0 and OpenID Connect standard-compliant authentication service, open-source libraries, application registration and configuration, robust conceptual and reference documentation, “quickstart samples,” code samples, tutorials, and how-to guides.
1919
aside:
2020
image:
2121
alt:
101 Bytes
Loading

articles/active-directory/develop/media/quickstart-v2-windows-desktop/windesktop-intro.svg

Lines changed: 23 additions & 22 deletions
Loading
33.2 KB
Loading

articles/active-directory/develop/media/v2-protocols-oidc/convergence-scenarios-webapp-webapi.svg

Lines changed: 664 additions & 0 deletions
Loading
17.8 KB
Loading

0 commit comments

Comments
 (0)