Skip to content

Commit 4afe055

Browse files
committed
Merge remote-tracking branch 'refs/remotes/MicrosoftDocs/master' into nitinme-retire-services
2 parents a2886d1 + b64203a commit 4afe055

File tree

3,549 files changed

+45595
-48605
lines changed

Some content is hidden

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

3,549 files changed

+45595
-48605
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@
163163
"url": "https://github.com/Azure/azure-functions-templates",
164164
"branch": "dev"
165165
},
166+
{
167+
"path_to_root": "functions-quickstart-java",
168+
"url": "https://github.com/Azure-Samples/functions-quickstarts-java",
169+
"branch": "master"
170+
},
166171
{
167172
"path_to_root": "functions-docs-csharp",
168173
"url": "https://github.com/Azure-Samples/functions-docs-csharp",

.openpublishing.redirection.json

Lines changed: 355 additions & 193 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/analytics-with-application-insights.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 03/24/2020
12+
ms.date: 04/05/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515

@@ -128,6 +128,7 @@ Add the profiles to the *TrustFrameworkExtensions.xml* file from the starter pac
128128
<InputClaim ClaimTypeReferenceId="PolicyId" PartnerClaimType="{property:Policy}" DefaultValue="{Policy:PolicyId}" />
129129
<InputClaim ClaimTypeReferenceId="CorrelationId" PartnerClaimType="{property:CorrelationId}" DefaultValue="{Context:CorrelationId}" />
130130
<InputClaim ClaimTypeReferenceId="Culture" PartnerClaimType="{property:Culture}" DefaultValue="{Culture:RFC5646}" />
131+
</InputClaims>
131132
</TechnicalProfile>
132133

133134
<TechnicalProfile Id="AppInsights-SignInRequest">
@@ -236,4 +237,4 @@ Add claim types and events to your user journey to fit your needs. You can use [
236237

237238
## Next steps
238239

239-
- Learn more about [Application Insights](application-insights-technical-profile.md) technical profile in the IEF reference.
240+
- Learn more about [Application Insights](application-insights-technical-profile.md) technical profile in the IEF reference.

articles/active-directory-b2c/azure-monitor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ To onboard your Azure AD tenant (the **Customer**), create an [Azure Resource Ma
8080

8181
Download the Azure Resource Manager template and parameter files:
8282

83-
- [rgDelegatedResourceManagement.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
84-
- [rgDelegatedResourceManagement.parameters.json](https://raw.githubusercontent.com/Azure/Azure-Lighthouse-samples/master/Azure-Delegated-Resource-Management/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
83+
- [rgDelegatedResourceManagement.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.json)
84+
- [rgDelegatedResourceManagement.parameters.json](https://github.com/Azure/Azure-Lighthouse-samples/blob/master/templates/rg-delegated-resource-management/rgDelegatedResourceManagement.parameters.json)
8585

8686
Next, update the parameters file with the values you recorded earlier. The following JSON snippet shows an example of an Azure Resource Manager template parameters file. For `authorizations.value.roleDefinitionId`, use the [built-in role](../role-based-access-control/built-in-roles.md) value for the *Contributor role*, `b24988ac-6180-42a0-ab88-20f7382dd24c`.
8787

articles/active-directory-b2c/custom-policy-keep-me-signed-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To enable KMSI, set the content definition `DataUri` element to [page identifier
5050

5151
## Add the metadata to the self-asserted technical profile
5252

53-
To add the KMSI checkbox to the sign-up and sign-in page, set the `setting.enableRememberMe` metadata to false. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
53+
To add the KMSI checkbox to the sign-up and sign-in page, set the `setting.enableRememberMe` metadata to true. Override the SelfAsserted-LocalAccountSignin-Email technical profiles in the extension file.
5454

5555
1. Find the ClaimsProviders element. If the element doesn't exist, add it.
5656
1. Add the following claims provider to the ClaimsProviders element:

articles/active-directory-b2c/customize-ui-overview.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/19/2020
12+
ms.date: 04/04/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -87,7 +87,10 @@ Review the following guidance before using your own HTML and CSS files to custom
8787

8888
When using your own HTML and CSS files to customize the UI, you can host your UI content on any publicly available HTTPS endpoint that supports CORS. For example, [Azure Blob storage](../storage/blobs/storage-blobs-introduction.md), web servers, CDNs, AWS S3, or file sharing systems.
8989

90-
The important point is that you host the content on a publicly available HTTPS endpoint with CORS enabled. You must use an absolute URL when you specify it in your content.
90+
The important point is that you host the content on a publicly available HTTPS endpoint with [CORS enabled](https://enable-cors.org/server.html). You must use an absolute URL when you specify it in your content.
91+
92+
> [!NOTE]
93+
> For details about creating HTML content, uploading content to Azure Blob storage, and configuring CORS, see the [Custom page content walkthrough](custom-policy-ui-customization.md#custom-page-content-walkthrough) section in the UI customization article.
9194
9295
## Get started with custom HTML and CSS
9396

27.4 KB
Loading
19.9 KB
Loading
34.7 KB
Loading
44.1 KB
Loading

0 commit comments

Comments
 (0)