Skip to content

Commit 5251037

Browse files
v-thepetv-thepet
committed
resolve merge conflict
2 parents ad27ea8 + 11d8400 commit 5251037

File tree

150 files changed

+1111
-688
lines changed

Some content is hidden

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

150 files changed

+1111
-688
lines changed

‎.openpublishing.redirection.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,7 +2874,7 @@
28742874
"source_path": "articles/azure-resource-manager/resource-manager-tutorial-move-resources.md",
28752875
"redirect_url": "/azure/azure-resource-manager/resource-group-move-resources",
28762876
"redirect_document_id": false
2877-
},
2877+
},
28782878
{
28792879
"source_path": "articles/azure-resource-manager/resource-manager-templates-parameters.md",
28802880
"redirect_url": "/azure/azure-resource-manager/resource-group-authoring-templates#parameters",
@@ -4690,7 +4690,7 @@
46904690
"redirect_url": "/azure/automation/source-control-integration",
46914691
"redirect_document_id": false
46924692
},
4693-
4693+
46944694
{
46954695
"source_path": "articles/automation/automation-credentials.md",
46964696
"redirect_url": "/azure/automation/shared-resources/credentials",
@@ -36817,6 +36817,11 @@
3681736817
"redirect_url": "/azure/cognitive-services/content-moderator/review-api#workflows",
3681836818
"redirect_document_id": true
3681936819
},
36820+
{
36821+
"source_path": "articles/cognitive-services/Computer-vision/Vision-API-How-to-Topics/HowToSubscribe.md",
36822+
"redirect_url": "/azure/cognitive-services/cognitive-services-apis-create-account#single-service-subscription",
36823+
"redirect_document_id": false
36824+
},
3682036825
{
3682136826
"source_path": "articles/cognitive-services/Computer-vision/Home-v1.md",
3682236827
"redirect_url": "/azure/cognitive-services/computer-vision/home",
@@ -36967,6 +36972,11 @@
3696736972
"redirect_url": "/azure/cognitive-services/QnAMaker/quickstarts/create-publish-knowledge-base",
3696836973
"redirect_document_id": true
3696936974
},
36975+
{
36976+
"source_path": "articles/virtual-machines/linux/prepay-rhel-software-charges.md",
36977+
"redirect_url": "/azure/virtual-machines/linux/prepay-suse-software-charges",
36978+
"redirect_document_id": true
36979+
},
3697036980
{
3697136981
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-hier-entity.md",
3697236982
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-entity-roles",
@@ -36991,6 +37001,11 @@
3699137001
"source_path": "articles/azure-app-configuration/howto-integrate-ci-cd-pipeline.md",
3699237002
"redirect_url": "/azure/azure-app-configuration/integrate-ci-cd-pipeline",
3699337003
"redirect_document_id": false
37004+
},
37005+
{
37006+
"source_path": "articles/app-service/app-service-jre-support.md",
37007+
"redirect_url": "/azure/app-service/configure-language-java",
37008+
"redirect_document_id": false
3699437009
}
3699537010
]
36996-
}
37011+
}

‎articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This article shows you how to enable sign-in for an ADFS user account by using [
2929
You need to store your certificate in your Azure AD B2C tenant.
3030

3131
1. Sign in to the [Azure portal](https://portal.azure.com/).
32-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
32+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
3333
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
3434
4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
3535
5. Select **Policy Keys** and then select **Add**.
@@ -67,7 +67,7 @@ You can define an ADFS account as a claims provider by adding it to the **Claims
6767
<Key Id="SamlMessageSigning" StorageReferenceId="B2C_1A_ADFSSamlCert"/>
6868
</CryptographicKeys>
6969
<OutputClaims>
70-
<OutputClaim ClaimTypeReferenceId="socialIdpUserId" PartnerClaimType="userPrincipalName" />
70+
<OutputClaim ClaimTypeReferenceId="issuerUserId" PartnerClaimType="userPrincipalName" />
7171
<OutputClaim ClaimTypeReferenceId="givenName" PartnerClaimType="given_name"/>
7272
<OutputClaim ClaimTypeReferenceId="surname" PartnerClaimType="family_name"/>
7373
<OutputClaim ClaimTypeReferenceId="email" PartnerClaimType="email"/>
@@ -124,13 +124,13 @@ The **ClaimsProviderSelection** element is analogous to an identity provider but
124124
Now that you have a button in place, you need to link it to an action. The action, in this case, is for Azure AD B2C to communicate with an ADFS account to receive a token.
125125

126126
1. Find the **OrchestrationStep** that includes `Order="2"` in the user journey.
127-
2. Add the following **ClaimsExchange** element making sure that you use the same value for **Id** that you used for **TargetClaimsExchangeId**:
127+
2. Add the following **ClaimsExchange** element making sure that you use the same value for the ID that you used for **TargetClaimsExchangeId**:
128128

129129
```XML
130130
<ClaimsExchange Id="ContosoExchange" TechnicalProfileReferenceId="Contoso-SAML2" />
131131
```
132132

133-
Update the value of **TechnicalProfileReferenceId** to the **Id** of the technical profile you created earlier. For example, `Contoso-SAML2`.
133+
Update the value of **TechnicalProfileReferenceId** to the ID of the technical profile you created earlier. For example, `Contoso-SAML2`.
134134

135135
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
136136

@@ -147,7 +147,7 @@ Replace the following values:
147147
148148
- **your-tenant** with your tenant name, such as your-tenant.onmicrosoft.com.
149149
- **your-policy** with your policy name. For example, B2C_1A_signup_signin_adfs.
150-
- **your-technical-profile** with tha name of your SAML identity provider technical profile. For example, Contoso-SAML2.
150+
- **your-technical-profile** with the name of your SAML identity provider technical profile. For example, Contoso-SAML2.
151151
152152
Open a browser and navigate to the URL. Make sure you type the correct URL and that you have access to the XML metadata file. To add a new relying party trust by using the ADFS Management snap-in and manually configure the settings, perform the following procedure on a federation server. Membership in **Administrators** or equivalent on the local computer is the minimum required to complete this procedure.
153153

‎articles/active-directory-b2c/active-directory-b2c-custom-setup-goog-idp.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Set up sign-in with a Google account in Azure Active Directory B2C using custom policies | Microsoft Docs
3-
description: Set up sign-in with an Google account in Azure Active Directory B2C using custom policies.
3+
description: Set up sign-in with a Google account in Azure Active Directory B2C using custom policies.
44
services: active-directory-b2c
55
author: davidmu1
66
manager: daveba
@@ -44,7 +44,7 @@ To enable sign-in for users from a Google account, you need to create a Google a
4444
You need to store the client secret that you previously recorded in your Azure AD B2C tenant.
4545

4646
1. Sign in to the [Azure portal](https://portal.azure.com/).
47-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
47+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
4848
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
4949
4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
5050
5. Select **Policy Keys** and then select **Add**.
@@ -86,7 +86,7 @@ You can define a Google account as a claims provider by adding it to the **Claim
8686
<Key Id="client_secret" StorageReferenceId="B2C_1A_GoogleSecret" />
8787
</CryptographicKeys>
8888
<OutputClaims>
89-
<OutputClaim ClaimTypeReferenceId="socialIdpUserId" PartnerClaimType="id" />
89+
<OutputClaim ClaimTypeReferenceId="issuerUserId" PartnerClaimType="id" />
9090
<OutputClaim ClaimTypeReferenceId="email" PartnerClaimType="email" />
9191
<OutputClaim ClaimTypeReferenceId="givenName" PartnerClaimType="given_name" />
9292
<OutputClaim ClaimTypeReferenceId="surname" PartnerClaimType="family_name" />
@@ -143,13 +143,13 @@ The **ClaimsProviderSelection** element is analogous to an identity provider but
143143
Now that you have a button in place, you need to link it to an action. The action, in this case, is for Azure AD B2C to communicate with a Google account to receive a token.
144144

145145
1. Find the **OrchestrationStep** that includes `Order="2"` in the user journey.
146-
2. Add the following **ClaimsExchange** element making sure that you use the same value for **Id** that you used for **TargetClaimsExchangeId**:
146+
2. Add the following **ClaimsExchange** element making sure that you use the same value for ID that you used for **TargetClaimsExchangeId**:
147147

148148
```XML
149149
<ClaimsExchange Id="GoogleExchange" TechnicalProfileReferenceId="Google-OAuth" />
150150
```
151151

152-
Update the value of **TechnicalProfileReferenceId** to the **Id** of the technical profile you created earlier. For example, `Google-OAuth`.
152+
Update the value of **TechnicalProfileReferenceId** to the ID of the technical profile you created earlier. For example, `Google-OAuth`.
153153

154154
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
155155

@@ -158,7 +158,7 @@ Now that you have a button in place, you need to link it to an action. The actio
158158
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
159159

160160
1. Sign in to the [Azure portal](https://portal.azure.com).
161-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
161+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
162162
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
163163
4. Select **Applications**, and then select **Add**.
164164
5. Enter a name for the application, for example *testapp1*.

‎articles/active-directory-b2c/active-directory-b2c-custom-setup-li-idp.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ You can define a LinkedIn account as a claims provider by adding it to the **Cla
9090
<Key Id="client_secret" StorageReferenceId="B2C_1A_LinkedInSecret" />
9191
</CryptographicKeys>
9292
<OutputClaims>
93-
<OutputClaim ClaimTypeReferenceId="socialIdpUserId" PartnerClaimType="id" />
93+
<OutputClaim ClaimTypeReferenceId="issuerUserId" PartnerClaimType="id" />
9494
<OutputClaim ClaimTypeReferenceId="givenName" PartnerClaimType="firstName" />
9595
<OutputClaim ClaimTypeReferenceId="surname" PartnerClaimType="lastName" />
9696
<OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="linkedin.com" />
@@ -188,13 +188,13 @@ The **ClaimsProviderSelection** element is analogous to an identity provider but
188188
Now that you have a button in place, you need to link it to an action. The action, in this case, is for Azure AD B2C to communicate with a LinkedIn account to receive a token.
189189

190190
1. Find the **OrchestrationStep** that includes `Order="2"` in the user journey.
191-
2. Add the following **ClaimsExchange** element making sure that you use the same value for **Id** that you used for **TargetClaimsExchangeId**:
191+
2. Add the following **ClaimsExchange** element making sure that you use the same value for the ID that you used for **TargetClaimsExchangeId**:
192192

193193
```XML
194194
<ClaimsExchange Id="LinkedInExchange" TechnicalProfileReferenceId="LinkedIn-OAUTH" />
195195
```
196196

197-
Update the value of **TechnicalProfileReferenceId** to the **Id** of the technical profile you created earlier. For example, `LinkedIn-OAUTH`.
197+
Update the value of **TechnicalProfileReferenceId** to the ID of the technical profile you created earlier. For example, `LinkedIn-OAUTH`.
198198

199199
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
200200

@@ -203,7 +203,7 @@ Now that you have a button in place, you need to link it to an action. The actio
203203
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
204204

205205
1. Sign in to the [Azure portal](https://portal.azure.com).
206-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
206+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
207207
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
208208
4. Select **Applications**, and then select **Add**.
209209
5. Enter a name for the application, for example *testapp1*.
@@ -248,13 +248,13 @@ The **ClaimsProviderSelection** element is analogous to an identity provider but
248248
Now that you have a button in place, you need to link it to an action. The action, in this case, is for Azure AD B2C to communicate with a LinkedIn account to receive a token.
249249

250250
1. Find the **OrchestrationStep** that includes `Order="2"` in the user journey.
251-
2. Add the following **ClaimsExchange** element making sure that you use the same value for **Id** that you used for **TargetClaimsExchangeId**:
251+
2. Add the following **ClaimsExchange** element making sure that you use the same value for the ID that you used for **TargetClaimsExchangeId**:
252252

253253
```XML
254254
<ClaimsExchange Id="LinkedInExchange" TechnicalProfileReferenceId="LinkedIn-OAUTH" />
255255
```
256256

257-
Update the value of **TechnicalProfileReferenceId** to the **Id** of the technical profile you created earlier. For example, `LinkedIn-OAUTH`.
257+
Update the value of **TechnicalProfileReferenceId** to the ID of the technical profile you created earlier. For example, `LinkedIn-OAUTH`.
258258

259259
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
260260

@@ -263,7 +263,7 @@ Now that you have a button in place, you need to link it to an action. The actio
263263
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
264264

265265
1. Sign in to the [Azure portal](https://portal.azure.com).
266-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
266+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
267267
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
268268
4. Select **Applications**, and then select **Add**.
269269
5. Enter a name for the application, for example *testapp1*.

‎articles/active-directory-b2c/active-directory-b2c-custom-setup-msa-idp.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To use a Microsoft account as an identity provider in Azure AD B2C, you need to
3131
1. Sign in to the [Microsoft Application Registration Portal](https://apps.dev.microsoft.com/?referrer=https://azure.microsoft.com/documentation/articles&deeplink=/appList) with your Microsoft account credentials.
3232
2. In the upper-right corner, select **Add an app**.
3333
3. Enter an **Application Name**, and then click **Create**
34-
4. Select **Generate New Password** and make sure that you copy the password to use when you configure the identity provider. Also copy the **Application Id**.
34+
4. Select **Generate New Password** and make sure that you copy the password to use when you configure the identity provider. Also copy the Application ID.
3535
5. Enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp` in **Redirect URLs**. Replace `your-tenant-name` with the name of your tenant.
3636
6. Select **Save**.
3737

@@ -40,7 +40,7 @@ To use a Microsoft account as an identity provider in Azure AD B2C, you need to
4040
You need to store the password that you generated and previously recorded in your Azure AD B2C tenant.
4141

4242
1. Sign in to the [Azure portal](https://portal.azure.com/).
43-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
43+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
4444
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
4545
4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
4646
5. Select **Policy Keys** and then select **Add**.
@@ -84,7 +84,7 @@ You can define Azure AD as a claims provider by adding the **ClaimsProvider** el
8484
<OutputClaims>
8585
<OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="live.com" />
8686
<OutputClaim ClaimTypeReferenceId="authenticationSource" DefaultValue="socialIdpAuthentication" />
87-
<OutputClaim ClaimTypeReferenceId="socialIdpUserId" PartnerClaimType="sub" />
87+
<OutputClaim ClaimTypeReferenceId="issuerUserId" PartnerClaimType="sub" />
8888
<OutputClaim ClaimTypeReferenceId="displayName" PartnerClaimType="name" />
8989
<OutputClaim ClaimTypeReferenceId="email" />
9090
</OutputClaims>
@@ -137,13 +137,13 @@ The **ClaimsProviderSelection** element is analogous to an identity provider but
137137
Now that you have a button in place, you need to link it to an action. The action, in this case, is for Azure AD B2C to communicate with a Twitter account to receive a token.
138138

139139
1. Find the **OrchestrationStep** that includes `Order="2"` in the user journey.
140-
2. Add the following **ClaimsExchange** element making sure that you use the same value for **Id** that you used for **TargetClaimsExchangeId**:
140+
2. Add the following **ClaimsExchange** element making sure that you use the same value for the ID that you used for **TargetClaimsExchangeId**:
141141

142142
```xml
143143
<ClaimsExchange Id="MicrosoftAccountExchange" TechnicalProfileReferenceId="MSA-OIDC" />
144144
```
145145

146-
Update the value of **TechnicalProfileReferenceId** to the **Id** of the technical profile you created earlier. For example, `MSA-OIDC`.
146+
Update the value of **TechnicalProfileReferenceId** to the ID of the technical profile you created earlier. For example, `MSA-OIDC`.
147147

148148
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.
149149

@@ -152,7 +152,7 @@ Now that you have a button in place, you need to link it to an action. The actio
152152
Communication with Azure AD B2c occurs through an application that you create in your tenant. This section lists optional steps you can complete to create a test application if you haven't already done so.
153153

154154
1. Sign in to the [Azure portal](https://portal.azure.com).
155-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
155+
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
156156
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
157157
4. Select **Applications**, and then select **Add**.
158158
5. Enter a name for the application, for example *testapp1*.

0 commit comments

Comments
 (0)