Skip to content

Commit e58fe1a

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into davidph-onnx-edge
2 parents d2e2373 + 0264e26 commit e58fe1a

File tree

4,901 files changed

+77424
-48233
lines changed

Some content is hidden

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

4,901 files changed

+77424
-48233
lines changed

.openpublishing.publish.config.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
158158
"branch": "master",
159159
"branch_mapping": {}
160-
},
160+
},
161161
{
162162
"path_to_root": "functions-quickstart-templates",
163163
"url": "https://github.com/Azure/azure-functions-templates",
@@ -187,7 +187,8 @@
187187
"path_to_root": "functions-docs-powershell",
188188
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
189189
"branch": "master"
190-
}, {
190+
},
191+
{
191192
"path_to_root": "samples-personalizer",
192193
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
193194
"branch": "master"
@@ -277,6 +278,11 @@
277278
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
278279
"branch": "master"
279280
},
281+
{
282+
"path_to_root": "MachineLearningNotebooks",
283+
"url": "https://github.com/Azure/MachineLearningNotebooks",
284+
"branch": "master"
285+
},
280286
{
281287
"path_to_root": "aml-sdk-samples",
282288
"url": "https://github.com/Azure/MachineLearningNotebooks",
@@ -361,7 +367,7 @@
361367
"path_to_root": "azure-sdk-for-java-script-event-hubs",
362368
"url": "https://github.com/Azure/azure-sdk-for-js/",
363369
"branch": "master"
364-
},
370+
},
365371
{
366372
"path_to_root": "azure-sdk-for-net-event-hubs",
367373
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -371,7 +377,7 @@
371377
"path_to_root": "azure-sdk-for-python-event-hubs",
372378
"url": "https://github.com/Azure/azure-sdk-for-python/",
373379
"branch": "master"
374-
},
380+
},
375381
{
376382
"path_to_root": "cosmos-dotnet-getting-started",
377383
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -505,5 +511,8 @@
505511
"Pdf": {
506512
"template_folder": "_themes.pdf"
507513
}
514+
},
515+
"docs_build_engine": {
516+
"name": "docfx_v3"
508517
}
509518
}

.openpublishing.redirection.json

Lines changed: 1189 additions & 66 deletions
Large diffs are not rendered by default.

.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"markdown.docsetName": "azure",
3+
"markdown.docsetRootFolderName": "articles",
4+
"markdown.omitDefaultJsonProperties": true,
25
"markdown.docsetLanguages": [
36
".NET Core CLI",
47
"Apache",
@@ -57,5 +60,6 @@
5760
],
5861
"cSpell.words": [
5962
"auditd"
60-
]
63+
],
64+
"git.ignoreLimitWarning": true
6165
}

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ articles/jenkins/ @TomArcherMsft
99
articles/terraform/ @TomArcherMsft
1010

1111
# Requires Internal Review
12-
articles/best-practices-availability-paired-regions.md @jpconnock @arob98 @syntaxc4 @tysonn @snoviking
12+
articles/best-practices-availability-paired-regions.md @jpconnock @martinekuan @syntaxc4 @tysonn @snoviking
1313

1414
# Governance
1515
articles/governance/ @DCtheGeek
1616

1717
# Configuration
18-
*.json @SyntaxC4 @snoviking @arob98
19-
.acrolinx-config.edn @MonicaRush @arob98
20-
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @arob98
18+
*.json @SyntaxC4 @snoviking @martinekuan
19+
.acrolinx-config.edn @MonicaRush @martinekuan
20+
articles/zone-pivot-groups.yml @SyntaxC4 @snoviking @martinekuan

articles/active-directory-b2c/TOC.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
href: custom-policy-overview.md
7575
- name: User accounts
7676
href: user-overview.md
77+
- name: User profile attributes
78+
href: user-profile-attributes.md
7779
- name: How-to guides
7880
items:
7981
- name: App integration
@@ -309,13 +311,15 @@
309311
items:
310312
- name: About technical profiles
311313
href: technical-profiles-overview.md
314+
- name: About validation technical profiles
315+
href: validation-technical-profile.md
316+
- name: Application Insights
317+
href: application-insights-technical-profile.md
318+
- name: Azure Active Directory
319+
href: active-directory-technical-profile.md
312320
- name: Azure Multi-Factor Authentication
313321
href: multi-factor-auth-technical-profile.md
314322
displayName: mfa
315-
- name: Claim resolvers
316-
href: claim-resolver-overview.md
317-
- name: Azure Active Directory
318-
href: active-directory-technical-profile.md
319323
- name: Claims transformation
320324
href: claims-transformation-technical-profile.md
321325
- name: JWT token issuer
@@ -329,6 +333,8 @@
329333
displayName: otp
330334
- name: OpenID Connect
331335
href: openid-connect-technical-profile.md
336+
- name: Phone factor
337+
href: phone-factor-technical-profile.md
332338
- name: REST
333339
href: restful-technical-profile.md
334340
- name: SAML
@@ -340,12 +346,12 @@
340346
- name: SSO session
341347
href: custom-policy-reference-sso.md
342348
displayName: single sign-on
343-
- name: Validation
344-
href: validation-technical-profile.md
345349
- name: UserJourneys
346350
href: userjourneys.md
347351
- name: RelyingParty
348352
href: relyingparty.md
353+
- name: Claim resolvers
354+
href: claim-resolver-overview.md
349355
- name: Use b2clogin.com
350356
items:
351357
- name: b2clogin.com overview
@@ -389,28 +395,28 @@
389395
href: user-migration.md
390396
- name: Reference
391397
items:
392-
- name: Identity Experience Framework release notes
393-
href: custom-policy-developer-notes.md
398+
- name: Billing model
399+
href: billing.md
394400
- name: Code samples
395401
href: https://azure.microsoft.com/resources/samples/?service=active-directory-b2c
396-
- name: Page layout versions
397-
href: page-layout.md
398402
- name: Cookie definitions
399403
href: cookie-definitions.md
400404
displayName: cookies, SameSite
401405
- name: Error codes
402406
href: error-codes.md
407+
- name: Extensions app
408+
href: extensions-app.md
409+
- name: Identity Experience Framework release notes
410+
href: custom-policy-developer-notes.md
403411
- name: Microsoft Graph API operations
404412
href: microsoft-graph-operations.md
413+
- name: Page layout versions
414+
href: page-layout.md
405415
- name: Region availability & data residency
406416
href: data-residency.md
407-
- name: Billing model
408-
href: billing.md
409417
- name: Threat management
410418
href: threat-management.md
411419
displayName: security
412-
- name: Extensions app
413-
href: extensions-app.md
414420
- name: User flow versions
415421
href: user-flow-versions.md
416422
- name: Resources

articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 03/09/2020
12+
ms.date: 03/24/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -111,6 +111,7 @@ The name of the claim is the name of the Azure AD attribute unless the **Partner
111111
## Requirements of an operation
112112

113113
- There must be exactly one **InputClaim** element in the claims bag for all Azure AD technical profiles.
114+
- The [user profile attributes article](user-profile-attributes.md) describes the supported Azure AD B2C user profile attributes you can use in the input claims, output claims, and persisted claims.
114115
- If the operation is `Write` or `DeleteClaims`, then it must also appear in a **PersistedClaims** element.
115116
- The value of the **userPrincipalName** claim must be in the format of `[email protected]`.
116117
- The **displayName** claim is required and cannot be an empty string.

0 commit comments

Comments
 (0)