Skip to content

Commit 83c3b61

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 1642278-loc-clarification
2 parents 0a13e81 + 41d3ee4 commit 83c3b61

File tree

298 files changed

+2221
-1528
lines changed

Some content is hidden

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

298 files changed

+2221
-1528
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ articles/directories.txt
2222
AzureMigration.ps1
2323

2424
!/.vscode/extensions.json
25+
articles/data-lake-analytics/.vscode/settings.json
26+
.gitignore

.openpublishing.redirection.json

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "https://github.com/Azure/azure-sdk-for-php",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path": "articles/container-registry/container-registry-upgrade.md",
10+
"redirect_url": "/azure/container-registry/container-registry-skus",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/azure-government/documentation-government-get-started-connect-with-vs.md",
1015
"redirect_url": "/azure/azure-government/documentation-government-welcome",
@@ -765,6 +770,12 @@
765770
"redirect_url": "/azure/machine-learning/service",
766771
"redirect_document_id": false
767772
},
773+
774+
{
775+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intents-only.md",
776+
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-intents-only",
777+
"redirect_document_id": false
778+
},
768779
{
769780
"source_path": "articles/cognitive-services/LUIS/luis-concept-roles.md",
770781
"redirect_url": "/azure/cognitive-services/LUIS/luis-concept-entity-types#entity-role-defines-context",
@@ -5275,6 +5286,26 @@
52755286
"redirect_url": "/azure/app-service-mobile",
52765287
"redirect_document_id": false
52775288
},
5289+
{
5290+
"source_path": "articles/application-gateway/application-gateway-customize-waf-rules-portal.md",
5291+
"redirect_url": "/azure/web-application-firewall/ag/application-gateway-customize-waf-rules-portal",
5292+
"redirect_document_id": false
5293+
},
5294+
{
5295+
"source_path": "articles/application-gateway/application-gateway-customize-waf-rules-powershell.md",
5296+
"redirect_url": "/azure/web-application-firewall/ag/application-gateway-customize-waf-rules-powershell",
5297+
"redirect_document_id": false
5298+
},
5299+
{
5300+
"source_path": "articles/application-gateway/application-gateway-customize-waf-rules-cli.md",
5301+
"redirect_url": "/azure/web-application-firewall/ag/application-gateway-customize-waf-rules-cli",
5302+
"redirect_document_id": false
5303+
},
5304+
{
5305+
"source_path": "articles/application-gateway/custom-waf-rules-overview.md",
5306+
"redirect_url": "/azure/web-application-firewall/ag/custom-waf-rules-overview",
5307+
"redirect_document_id": false
5308+
},
52785309
{
52795310
"source_path": "articles/application-gateway/application-gateway-waf-configuration.md",
52805311
"redirect_url": "/azure/web-application-firewall/ag/application-gateway-waf-configuration",
@@ -16225,11 +16256,6 @@
1622516256
"redirect_url": "/azure/stream-analytics/stream-analytics-troubleshoot-input",
1622616257
"redirect_document_id": false
1622716258
},
16228-
{
16229-
"source_path": "articles/stream-analytics/powerbi-output-managed-identity.md",
16230-
"redirect_url": "/azure/stream-analytics/stream-analytics-define-outputs#power-bi",
16231-
"redirect_document_id": false
16232-
},
1623316259
{
1623416260
"source_path": "articles/stream-analytics/vs-code-how-to.md",
1623516261
"redirect_url": "/azure/stream-analytics/vscode-explore-jobs",
@@ -43720,5 +43746,15 @@
4372043746
"redirect_url": "/azure/cognitive-services/speech-service/how-to-use-conversation-transcription",
4372143747
"redirect_document_id": false
4372243748
},
43749+
{
43750+
"source_path": "articles/machine-learning/service/publish-a-machine-learning-web-service.md",
43751+
"redirect_url": "/azure/machine-learning/service/deploy-a-machine-learning-web-service",
43752+
"redirect_document_id": false
43753+
},
43754+
{
43755+
"source_path": "articles/machine-learning/studio/linear-regression-in-azure.md",
43756+
"redirect_url": "/azure/machine-learning/studio/use-case-excel-studio",
43757+
"redirect_document_id": false
43758+
}
4372343759
]
4372443760
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To enable sign-in for users with a Microsoft account, you need to register an ap
4040
1. Select **Certificates & secrets**
4141
1. Click **New client secret**
4242
1. Enter a **Description** for the secret, for example *MSA Application Client Secret*, and then click **Add**.
43-
1. Record the application password shown in the **VALUE** column. You use this value in the next section.
43+
1. Record the application password shown in the **Value** column. You use this value in the next section.
4444

4545
## Create a policy key
4646

articles/active-directory-b2c/active-directory-b2c-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Not currently. This feature is on our roadmap. Verifying your domain in the **Do
128128

129129
Follow these steps to delete your Azure AD B2C tenant.
130130

131-
You can use the current **Applications** experience or our new unified **App registrations (Preview)** experience. [Learn more about the preview experience](https://aka.ms/b2cappregintro).
131+
You can use the current **Applications** experience or our new unified **App registrations (Preview)** experience. [Learn more about the new experience](https://aka.ms/b2cappregintro).
132132

133133
#### [Applications](#tab/applications/)
134134

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ You need to register these two applications in your Azure AD B2C tenant only onc
6969

7070
### Register the IdentityExperienceFramework application
7171

72-
To register an application in your Azure AD B2C tenant, you can use the current **Applications** experience, or our new unified **App registrations (Preview)** experience. [Learn more about the preview experience](https://aka.ms/b2cappregintro).
72+
To register an application in your Azure AD B2C tenant, you can use the current **Applications** experience, or our new unified **App registrations (Preview)** experience. [Learn more about the new experience](https://aka.ms/b2cappregintro).
7373

7474
#### [Applications](#tab/applications/)
7575

@@ -147,7 +147,7 @@ Now, grant permissions to the API scope you exposed earlier in the *IdentityExpe
147147
1. Select **Grant admin consent for (your tenant name)**.
148148
1. Select your currently signed-in administrator account, or sign in with an account in your Azure AD B2C tenant that's been assigned at least the *Cloud application administrator* role.
149149
1. Select **Accept**.
150-
1. Select **Refresh**, and then verify that "Granted for ..." appears under **STATUS** for both scopes. It might take a few minutes for the permissions to propagate.
150+
1. Select **Refresh**, and then verify that "Granted for ..." appears under **Status** for both scopes. It might take a few minutes for the permissions to propagate.
151151

152152
* * *
153153

articles/active-directory-b2c/active-directory-b2c-reference-audit-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Follow these steps register an application, grant it the required Microsoft Grap
119119
1. Select **Grant admin consent for (your tenant name)**.
120120
1. Select your currently signed-in account if it's been assigned the *Global Administrator* role, or sign in with an account in your Azure AD B2C tenant that's been assigned the *Global Administrator* role.
121121
1. Select **Accept**.
122-
1. Select **Refresh**, and then verify that "Granted for ..." appears under **STATUS** for the *AuditLog.Read.All* permission. It might take a few minutes for the permissions to propagate.
122+
1. Select **Refresh**, and then verify that "Granted for ..." appears under **Status** for the *AuditLog.Read.All* permission. It might take a few minutes for the permissions to propagate.
123123

124124
* * *
125125

articles/active-directory-b2c/active-directory-b2c-setup-aad-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ To enable sign-in for users from a specific Azure AD organization, you need to r
4343
4444
1. Select **Register**. Record the **Application (client) ID** for use in a later step.
4545
1. Select **Certificates & secrets**, and then select **New client secret**.
46-
1. Enter a **Description** for the secret, select an expiration, and then select **Add**. Record the **VALUE** of the secret for use in a later step.
46+
1. Enter a **Description** for the secret, select an expiration, and then select **Add**. Record the **Value** of the secret for use in a later step.
4747
4848
## Create a policy key
4949

articles/active-directory-b2c/active-directory-b2c-setup-commonaad-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ To enable sign-in for users from a specific Azure AD organization, you need to r
4343
4444
1. Select **Register**. Record the **Application (client) ID** for use in a later step.
4545
1. Select **Certificates & secrets**, and then select **New client secret**.
46-
1. Enter a **Description** for the secret, select an expiration, and then select **Add**. Record the **VALUE** of the secret for use in a later step.
46+
1. Enter a **Description** for the secret, select an expiration, and then select **Add**. Record the **Value** of the secret for use in a later step.
4747
4848
## Create a policy key
4949

articles/active-directory-b2c/active-directory-b2c-setup-msa-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To use a Microsoft account as an [identity provider](active-directory-b2c-refere
3333
1. Select **Certificates & secrets**
3434
1. Click **New client secret**
3535
1. Enter a **Description** for the secret, for example *Application password 1*, and then click **Add**.
36-
1. Record the application password shown in the **VALUE** column. You need this when you configure the identity provider in the next section.
36+
1. Record the application password shown in the **Value** column. You need this when you configure the identity provider in the next section.
3737

3838
## Configure a Microsoft account as an identity provider
3939

articles/active-directory-b2c/active-directory-b2c-tutorials-desktop-app-webapi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ In the prerequisite tutorial, you registered a native client application named *
6262
1. Under **Configured permissions**, select **Add a permission**.
6363
1. Select the **My APIs** tab.
6464
1. Select the API to which the native client application should be granted access. For example, *webapi1*.
65-
1. Under **PERMISSION**, expand **demo**, and then select the scopes that you defined earlier. For example, *demo.read* and *demo.write*.
65+
1. Under **Permission**, expand **demo**, and then select the scopes that you defined earlier. For example, *demo.read* and *demo.write*.
6666
1. Select **Add permissions**. As directed, wait a few minutes before proceeding to the next step.
6767
1. Select **Grant admin consent for (your tenant name)**.
6868
1. Select your currently signed-in administrator account, or sign in with an account in your Azure AD B2C tenant that's been assigned at least the *Cloud application administrator* role.
6969
1. Select **Accept**.
70-
1. Select **Refresh**, and then verify that "Granted for ..." appears under **STATUS** for both scopes. It might take a few minutes for the permissions to propagate.
70+
1. Select **Refresh**, and then verify that "Granted for ..." appears under **Status** for both scopes. It might take a few minutes for the permissions to propagate.
7171

7272
* * *
7373

0 commit comments

Comments
 (0)