Skip to content

Commit 3747315

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 2020-3-1-CMK-updates
2 parents 76af253 + 3d11b80 commit 3747315

File tree

993 files changed

+11605
-5400
lines changed

Some content is hidden

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

993 files changed

+11605
-5400
lines changed

.openpublishing.publish.config.json

Lines changed: 8 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"
@@ -366,7 +367,7 @@
366367
"path_to_root": "azure-sdk-for-java-script-event-hubs",
367368
"url": "https://github.com/Azure/azure-sdk-for-js/",
368369
"branch": "master"
369-
},
370+
},
370371
{
371372
"path_to_root": "azure-sdk-for-net-event-hubs",
372373
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -376,7 +377,7 @@
376377
"path_to_root": "azure-sdk-for-python-event-hubs",
377378
"url": "https://github.com/Azure/azure-sdk-for-python/",
378379
"branch": "master"
379-
},
380+
},
380381
{
381382
"path_to_root": "cosmos-dotnet-getting-started",
382383
"url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -510,5 +511,8 @@
510511
"Pdf": {
511512
"template_folder": "_themes.pdf"
512513
}
514+
},
515+
"docs_build_engine": {
516+
"name": "docfx_v3"
513517
}
514518
}

.openpublishing.redirection.json

Lines changed: 216 additions & 30 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/custom-policy-configure-user-input.md

Lines changed: 5 additions & 2 deletions
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: conceptual
12-
ms.date: 03/10/2020
12+
ms.date: 03/17/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -19,9 +19,12 @@ ms.subservice: B2C
1919

2020
In this article, you collect a new attribute during your sign-up journey in Azure Active Directory B2C (Azure AD B2C). You'll obtain the users' city, configure it as a drop-down, and define whether it's required to be provided.
2121

22+
> [!NOTE]
23+
> This sample uses the built-in claim 'city'. Instead, you can choose one of the supported [Azure AD B2C built-in attributes](user-profile-attributes.md) or a custom attribute. To use a custom attribute, [enable custom attributes in your policy](custom-policy-custom-attributes.md). To use a different built-in or custom attribute, replace 'city' with the attribute of your choice, for example the built-in attribute *jobTitle* or a custom attribute like *extension_loyaltyId*.
24+
2225
You can gather initial data from your users by using the sign-up or sign-in user journey. Additional claims can be gathered later by using a profile edit user journey. Anytime Azure AD B2C gathers information directly from the user interactively, the Identity Experience Framework uses its [self-asserted technical profile](self-asserted-technical-profile.md). In this sample, you:
2326

24-
1. Define a "city" claim.
27+
1. Define a "city" claim.
2528
1. Ask the user for their city.
2629
1. Persist the city to the user profile in the Azure AD B2C directory.
2730
1. Read the city claim from the Azure AD B2C directory on each sign-in.

articles/active-directory-b2c/custom-policy-custom-attributes.md

Lines changed: 84 additions & 246 deletions
Large diffs are not rendered by default.

articles/active-directory-domain-services/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191
href: password-policy.md
9292
- name: Enable security audit events
9393
href: security-audit-events.md
94+
- name: Analyze audit events with Azure Monitor Workbooks
95+
href: use-azure-monitor-workbooks.md
9496
- name: Domain-join VMs
9597
items:
9698
- name: Windows Server VM from template
67.9 KB
Loading
123 KB
Loading
36.4 KB
Loading
127 KB
Loading
77.7 KB
Loading

0 commit comments

Comments
 (0)