Skip to content

Commit cd5da5a

Browse files
author
Glenn Gailey
committed
Merge branch 'release-marmalade' of https://github.com/MicrosoftDocs/azure-docs-pr into marmalade
2 parents 06ae52f + 0a408ef commit cd5da5a

File tree

2,762 files changed

+51005
-31043
lines changed

Some content is hidden

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

2,762 files changed

+51005
-31043
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@
233233
"url": "https://github.com/Azure-Samples/azure-iot-samples-node",
234234
"branch": "master"
235235
},
236+
{
237+
"path_to_root": "azure-iot-sdk-node",
238+
"url": "https://github.com/Azure/azure-iot-sdk-node",
239+
"branch": "master"
240+
},
236241
{
237242
"path_to_root": "iot-samples-c",
238243
"url": "https://github.com/Azure/azure-iot-sdk-c",

.openpublishing.redirection.json

Lines changed: 410 additions & 25 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2+
3+
# Horizontals
4+
5+
## Azure Policy: Samples
6+
articles/**/policy-samples.md @DCtheGeek
7+
includes/policy/ @DCtheGeek
8+
29
# Cognitive Services
310
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
411

@@ -9,7 +16,7 @@ articles/jenkins/ @TomArcherMsft
916
articles/terraform/ @TomArcherMsft
1017

1118
# Requires Internal Review
12-
articles/best-practices-availability-paired-regions.md @jpconnock @martinekuan @syntaxc4 @tysonn @snoviking
19+
articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
1320

1421
# Governance
1522
articles/governance/ @DCtheGeek

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For more information, see the [Code of Conduct FAQ](https://opensource.microsoft
1111

1212
## How can I contribute?
1313

14-
There are a variety of ways to contribute to the documentation, review the sections below to find out which one is right for you.
14+
There are many ways to contribute to the documentation, review the sections below to find out which one is right for you.
1515

1616
### Reporting Bugs and Suggesting Enhancements
1717

articles/active-directory-b2c/userjourneys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The **OrchestrationStep** element contains the following attributes:
6060
| Attribute | Required | Description |
6161
| --------- | -------- | ----------- |
6262
| `Order` | Yes | The order of the orchestration steps. |
63-
| `Type` | Yes | The type of the orchestration step. Possible values: <ul><li>**ClaimsProviderSelection** - Indicates that the orchestration step presents various claims providers to the user to select one.</li><li>**CombinedSignInAndSignUp** - Indicates that the orchestration step presents a combined social provider sign-in and local account sign-up page.</li><li>**ClaimsExchange** - Indicates that the orchestration step exchanges claims with a claims provider.</li><li>**GetClaims** - Indicates that the orchestration step reads the input claims.</li><li>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
63+
| `Type` | Yes | The type of the orchestration step. Possible values: <ul><li>**ClaimsProviderSelection** - Indicates that the orchestration step presents various claims providers to the user to select one.</li><li>**CombinedSignInAndSignUp** - Indicates that the orchestration step presents a combined social provider sign-in and local account sign-up page.</li><li>**ClaimsExchange** - Indicates that the orchestration step exchanges claims with a claims provider.</li><li>**GetClaims** - Specifies that the orchestration step should process claim data sent to Azure AD B2C from the relying party via its `InputClaims` configuration.</li><li>**SendClaims** - Indicates that the orchestration step sends the claims to the relying party with a token issued by a claims issuer.</li></ul> |
6464
| ContentDefinitionReferenceId | No | The identifier of the [content definition](contentdefinitions.md) associated with this orchestration step. Usually the content definition reference identifier is defined in the self-asserted technical profile. But, there are some cases when Azure AD B2C needs to display something without a technical profile. There are two examples - if the type of the orchestration step is one of following: `ClaimsProviderSelection` or `CombinedSignInAndSignUp`, Azure AD B2C needs to display the identity provider selection without having a technical profile. |
6565
| CpimIssuerTechnicalProfileReferenceId | No | The type of the orchestration step is `SendClaims`. This property defines the technical profile identifier of the claims provider that issues the token for the relying party. If absent, no relying party token is created. |
6666

articles/active-directory/app-provisioning/application-provisioning-config-problem-no-users-provisioned.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,15 @@
22
title: Users are not being provisioned in my application
33
description: How to troubleshoot common issues faced when you don't see users appearing in an Azure AD Gallery Application you have configured for user provisioning with Azure AD
44
services: active-directory
5-
documentationcenter: ''
65
author: msmimart
76
manager: CelesteDG
8-
ms.assetid:
97
ms.service: active-directory
108
ms.subservice: app-provisioning
119
ms.workload: identity
12-
ms.tgt_pltfrm: na
13-
ms.devlang: na
1410
ms.topic: conceptual
1511
ms.date: 04/20/2020
1612
ms.author: mimart
1713
ms.reviewer: arvinh
18-
ms.collection: M365-identity-device-management
1914
---
2015

2116
# No users are being provisioned

articles/active-directory/app-provisioning/application-provisioning-config-problem-scim-compatibility.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@
22
title: Known issues with SCIM 2.0 protocol compliance - Azure AD
33
description: How to solve common protocol compatibility issues faced when adding a non-gallery application that supports SCIM 2.0 to Azure AD
44
services: active-directory
5-
documentationcenter: ''
65
author: msmimart
76
manager: CelesteDG
8-
9-
ms.assetid:
107
ms.service: active-directory
118
ms.subservice: app-provisioning
129
ms.workload: identity
13-
ms.tgt_pltfrm: na
14-
ms.devlang: na
1510
ms.topic: conceptual
1611
ms.date: 12/03/2018
1712
ms.author: mimart
1813
ms.reviewer: arvinh
19-
20-
ms.collection: M365-identity-device-management
2114
---
2215

2316
# Known issues and resolutions with SCIM 2.0 protocol compliance of the Azure AD User Provisioning service

articles/active-directory/app-provisioning/application-provisioning-config-problem-storage-limit.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@
22
title: Problem saving admin credentials configuring Azure AD gallery app
33
description: How to troubleshoot common issues faced when configuring user provisioning to an application already listed in the Azure AD Application Gallery
44
services: active-directory
5-
documentationcenter: ''
65
author: msmimart
76
manager: CelesteDG
8-
9-
ms.assetid:
107
ms.service: active-directory
118
ms.subservice: app-provisioning
129
ms.workload: identity
13-
ms.tgt_pltfrm: na
14-
ms.devlang: na
1510
ms.topic: conceptual
1611
ms.date: 02/21/2018
1712
ms.author: mimart
1813
ms.reviewer: arvinh
19-
20-
ms.collection: M365-identity-device-management
2114
---
2215

2316
# Problem saving administrator credentials while configuring user provisioning to an Azure Active Directory Gallery application

articles/active-directory/app-provisioning/application-provisioning-config-problem-wrong-users-provisioned.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@
22
title: Wrong set of users are provisioned to an Azure AD Gallery app
33
description: Learn how to find out why a different set of users are being provisioned to an application than those you expected
44
services: active-directory
5-
documentationcenter: ''
65
author: msmimart
76
manager: CelesteDG
8-
9-
ms.assetid:
107
ms.service: active-directory
118
ms.subservice: app-provisioning
129
ms.workload: identity
13-
ms.tgt_pltfrm: na
14-
ms.devlang: na
1510
ms.topic: conceptual
1611
ms.date: 09/20/2018
1712
ms.author: mimart
1813
ms.reviewer: asteen
19-
20-
ms.collection: M365-identity-device-management
2114
---
2215

2316
# Wrong set of users are being provisioned to an Azure AD Gallery application

articles/active-directory/app-provisioning/application-provisioning-config-problem.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@
22
title: Problem configuring user provisioning to an Azure AD Gallery app
33
description: How to troubleshoot common issues faced when configuring user provisioning to an application already listed in the Azure AD Application Gallery
44
services: active-directory
5-
documentationcenter: ''
65
author: msmimart
76
manager: CelesteDG
8-
9-
ms.assetid:
107
ms.service: active-directory
118
ms.subservice: app-provisioning
129
ms.workload: identity
13-
ms.tgt_pltfrm: na
14-
ms.devlang: na
1510
ms.topic: conceptual
1611
ms.date: 09/03/2019
1712
ms.author: mimart
1813
ms.reviewer: asteen
19-
20-
ms.collection: M365-identity-device-management
2114
---
2215

2316
# Problem configuring user provisioning to an Azure AD Gallery application

0 commit comments

Comments
 (0)