Skip to content

Commit 8161566

Browse files
mgblythemgblythe
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into mb-1114-pbi-quickstarts
2 parents 45132b7 + 6810b2d commit 8161566

File tree

1,064 files changed

+17994
-12633
lines changed

Some content is hidden

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

1,064 files changed

+17994
-12633
lines changed

‎.acrolinx-config.edn

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,2 @@
11
{:allowed-branchname-matches ["^master$" "^release..*"]
2-
:allowed-filename-matches ["articles" "includes"]
3-
4-
:template-header
5-
"
6-
## Acrolinx Scorecards
7-
8-
**A minimum Acrolinx score of 80 is required.**
9-
10-
Click the scorecard links for each article to review the Acrolinx feedback on grammar, spelling, punctuation, writing style, and terminology:
11-
12-
| Article | Score | Issues | Scorecard |
13-
| ------- | ----- | ------ | --------- |
14-
"
15-
16-
;; do not remove the spaces at the end of lines! That is markdown for
17-
;; linebreak
18-
:template-change
19-
"| **${github/filename}** | ${acrolinx/qualityscore} | ${acrolinx/flags/issues} | [link](${acrolinx/scorecard}) |
20-
"
21-
22-
:template-footer
23-
"
24-
**More info about Acrolinx**
25-
26-
- [Install Acrolinx locally for VSCode](https://review.docs.microsoft.com/en-us/help/contribute/contribute-acrolinx-vscode)
27-
- [Report false positives or issues](https://aka.ms/acrolinxbug)
28-
29-
"}
2+
:allowed-filename-matches ["articles" "includes"]}

‎.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,18 @@
271271
"url": "https://github.com/Azure-Samples/cognitive-services-vision-csharp-sdk-quickstarts",
272272
"branch": "master",
273273
"branch_mapping": {}
274+
},
275+
{
276+
"path_to_root": "cognitive-face-csharp-sample",
277+
"url": "https://github.com/Azure-Samples/Cognitive-Face-CSharp-sample",
278+
"branch": "master",
279+
"branch_mapping": {}
280+
},
281+
{
282+
"path_to_root": "cognitive-services-face-android-detect",
283+
"url": "https://github.com/Azure-Samples/cognitive-services-face-android-detect",
284+
"branch": "master",
285+
"branch_mapping": {}
274286
}
275287
],
276288
"branch_target_mapping": {

‎.openpublishing.redirection.json

Lines changed: 125 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/machine-learning/service/how-to-choose-a-dev-environment.md",
5+
"redirect_url": "/azure/machine-learning/service/how-to-configure-environment",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/frontdoor/front-door-powershell-reference.md",
510
"redirect_url": "/powershell/module/azurerm.frontdoor",
@@ -150,6 +155,21 @@
150155
"redirect_url": "/azure/active-directory/users-groups-roles/users-sharing-accounts",
151156
"redirect_document_id": true
152157
},
158+
{
159+
"source_path": "articles/active-directory/fundamentals/active-directory-administer.md",
160+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "articles/active-directory/fundamentals/identity-fundamentals.md",
165+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "articles/active-directory/fundamentals/understand-azure-identity-solutions.md",
170+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-whatis",
171+
"redirect_document_id": false
172+
},
153173
{
154174
"source_path": "articles/active-directory/fundamentals/active-directory-groups-restore-azure-portal.md",
155175
"redirect_url": "/azure/active-directory/users-groups-roles/groups-restore-deleted",
@@ -356,6 +376,16 @@
356376
"redirect_url": "/azure/cosmos-db/conflict-resolution-policies",
357377
"redirect_document_id": true
358378
},
379+
{
380+
"source_path": "articles/cosmos-db/manage-account.md",
381+
"redirect_url": "/azure/cosmos-db/how-to-manage-database-account",
382+
"redirect_document_id": false
383+
},
384+
{
385+
"source_path": "articles/cosmos-db/indexing-policies.md",
386+
"redirect_url": "/azure/cosmos-db/indexing-policy",
387+
"redirect_document_id": true
388+
},
359389
{
360390
"source_path": "articles/cosmos-db/distribute-data-globally-benefits.md",
361391
"redirect_url": "/azure/cosmos-db/distribute-data-globally",
@@ -3261,6 +3291,11 @@
32613291
"redirect_url": "/azure/application-gateway/tutorial-autoscale-ps",
32623292
"redirect_document_id": false
32633293
},
3294+
{
3295+
"source_path": "articles/application-gateway/application-gateway-create-gateway-portal.md",
3296+
"redirect_url": "/azure/application-gateway/quick-create-portal",
3297+
"redirect_document_id": false
3298+
},
32643299
{
32653300
"source_path": "articles/application-insights/app-insights-azure-diagnostics.md",
32663301
"redirect_url": "/azure/monitoring-and-diagnostics/azure-diagnostics-configure-application-insights",
@@ -7844,6 +7879,11 @@
78447879
"redirect_url": "/azure/cosmos-db/enable-multi-master",
78457880
"redirect_document_id": false
78467881
},
7882+
{
7883+
"source_path": "articles/cosmos-db/sql-api-resources.md",
7884+
"redirect_url": "/azure/cosmos-db/databases-containers-items",
7885+
"redirect_document_id": false
7886+
},
78477887
{
78487888
"source_path": "articles/cosmos-db/multi-master-oss-nosql.md",
78497889
"redirect_url": "/azure/cosmos-db/consistency-levels-across-apis",
@@ -9266,7 +9306,7 @@
92669306
},
92679307
{
92689308
"source_path": "articles/documentdb/documentdb-indexing-policies.md",
9269-
"redirect_url": "https://docs.microsoft.com/azure/cosmos-db/indexing-policies",
9309+
"redirect_url": "/azure/cosmos-db/indexing-policy",
92709310
"redirect_document_id": false
92719311
},
92729312
{
@@ -9999,6 +10039,11 @@
999910039
"redirect_url": "/azure/log-analytics/log-analytics-data-security",
1000010040
"redirect_document_id": false
1000110041
},
10042+
{
10043+
"source_path": "articles/log-analytics/log-analytics-concept-hybrid.md",
10044+
"redirect_url": "/azure/log-analytics/log-analytics-agent-overview",
10045+
"redirect_document_id": false
10046+
},
1000210047
{
1000310048
"source_path": "articles/log-analytics/log-analytics-change-tracking.md",
1000410049
"redirect_url": "/azure/automation/automation-change-tracking",
@@ -11069,6 +11114,11 @@
1106911114
"redirect_url": "/azure/monitoring-and-diagnostics/alert-log",
1107011115
"redirect_document_id": false
1107111116
},
11117+
{
11118+
"source_path": "articles/monitoring-and-diagnostics/monitoring-overview-unified-alerts.md",
11119+
"redirect_url": "/azure/monitoring-and-diagnostics/monitoring-overview-alerts",
11120+
"redirect_document_id": false
11121+
},
1107211122
{
1107311123
"source_path": "articles/monitoring-and-diagnostics/monitoring-create-activity-log-alerts-with-resource-manager-template.md",
1107411124
"redirect_url": "/azure/monitoring-and-diagnostics/alert-activity-log",
@@ -27239,7 +27289,7 @@
2723927289
},
2724027290
{
2724127291
"source_path": "articles/active-directory/application-proxy-sso-overview.md",
27242-
"redirect_url": "/azure/active-directory/manage-apps/application-proxy-single-sign-on",
27292+
"redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
2724327293
"redirect_document_id": false
2724427294
},
2724527295
{
@@ -28405,8 +28455,8 @@
2840528455
},
2840628456
{
2840728457
"source_path": "articles/active-directory/application-config-sso-how-to-choose-sign-on-method.md",
28408-
"redirect_url": "/azure/active-directory/manage-apps/single-sign-on-modes",
28409-
"redirect_document_id": true
28458+
"redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
28459+
"redirect_document_id": false
2841028460
},
2841128461
{
2841228462
"source_path": "articles/active-directory/application-config-sso-how-to-configure-federated-sso-gallery.md",
@@ -28633,6 +28683,16 @@
2863328683
"redirect_url": "/azure/active-directory/manage-apps/developer-guidance-for-integrating-applications",
2863428684
"redirect_document_id": true
2863528685
},
28686+
{
28687+
"source_path": "articles/active-directory/manage-apps/application-proxy-single-sign-on.md",
28688+
"redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
28689+
"redirect_document_id": false
28690+
},
28691+
{
28692+
"source_path": "articles/active-directory/manage-apps/single-sign-on-modes.md",
28693+
"redirect_url": "/azure/active-directory/manage-apps/what-is-single-sign-on",
28694+
"redirect_document_id": false
28695+
},
2863628696
{
2863728697
"source_path": "articles/virtual-machines/linux/classic/cli-use-docker.md",
2863828698
"redirect_url": "/azure/virtual-machines/linux/dockerextension",
@@ -30511,11 +30571,70 @@
3051130571
"redirect_url": "/azure/iot-central/quick-deploy-iot-central",
3051230572
"redirect_document_id" : false
3051330573
},
30514-
30515-
{
30574+
{
30575+
"source_path": "articles/media-services/latest/create-account-cli-quickstart.md",
30576+
"redirect_url": "/azure/media-services/latest/create-account-cli-how-to",
30577+
"redirect_document_id" : false
30578+
},
30579+
{
3051630580
"source_path": "articles/backup/backup-mabs-upgrade-to-v2.md",
3051730581
"redirect_url": "/azure/backup/backup-mabs-whats-new-mabs",
3051830582
"redirect_document_id" : false
30583+
},
30584+
{
30585+
"source_path": "articles/monitoring/monitoring-solution-agenthealth.md",
30586+
"redirect_url": "/azure/azure-monitor/insights/solution-agenthealth",
30587+
"redirect_document_id": "false"
30588+
},
30589+
{
30590+
"source_path": "articles/monitoring/monitoring-solution-office-365.md",
30591+
"redirect_url": "/azure/azure-monitor/insights/solution-office-365",
30592+
"redirect_document_id": "false"
30593+
},
30594+
{
30595+
"source_path": "articles/monitoring/monitoring-solutions.md",
30596+
"redirect_url": "/azure/azure-monitor/insights/solutions",
30597+
"redirect_document_id": "false"
30598+
},
30599+
{
30600+
"source_path": "articles/monitoring/monitoring-solutions-best-practices.md",
30601+
"redirect_url": "/azure/azure-monitor/insights/solutions-best-practices",
30602+
"redirect_document_id": "false"
30603+
},
30604+
{
30605+
"source_path": "articles/monitoring/monitoring-solutions-creating.md",
30606+
"redirect_url": "/azure/azure-monitor/insights/solutions-creating",
30607+
"redirect_document_id": "false"
30608+
},
30609+
{
30610+
"source_path": "articles/monitoring/monitoring-solutions-inventory.md",
30611+
"redirect_url": "/azure/azure-monitor/insights/solutions-inventory",
30612+
"redirect_document_id": "false"
30613+
},
30614+
{
30615+
"source_path": "articles/monitoring/monitoring-solutions-resources-automation.md",
30616+
"redirect_url": "/azure/azure-monitor/insights/solutions-resources-automation",
30617+
"redirect_document_id": "false"
30618+
},
30619+
{
30620+
"source_path": "articles/monitoring/monitoring-solutions-resources-searches-alerts.md",
30621+
"redirect_url": "/azure/azure-monitor/insights/solutions-resources-searches-alerts",
30622+
"redirect_document_id": "false"
30623+
},
30624+
{
30625+
"source_path": "articles/monitoring/monitoring-solutions-resources-views.md",
30626+
"redirect_url": "/azure/azure-monitor/insights/solutions-resources-views",
30627+
"redirect_document_id": "false"
30628+
},
30629+
{
30630+
"source_path": "articles/monitoring/monitoring-solutions-solution-file.md",
30631+
"redirect_url": "/azure/azure-monitor/insights/solutions-solution-file",
30632+
"redirect_document_id": "false"
30633+
},
30634+
{
30635+
"source_path": "articles/monitoring/monitoring-solution-targeting.md",
30636+
"redirect_url": "/azure/azure-monitor/insights/solution-targeting",
30637+
"redirect_document_id": "false"
3051930638
}
3052030639
]
3052130640
}

‎articles/active-directory-b2c/active-directory-b2c-custom-guide-eventlogger-appins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When you use Azure Active Directory (Azure AD) B2C together with Azure Applicati
2727
2828
## How it works
2929

30-
The Identity Experience Framework in Azure AD B2C includes the provider `Handler="Web.TPEngine.Providers.UserJourneyContextProvider, Web.TPEngine, Version=1.0.0.0`. It sends event data directly to Application Insights by using the instrumentation key provided to Azure AD B2C.
30+
The Identity Experience Framework in Azure AD B2C includes the provider `Handler="Web.TPEngine.Providers.AzureApplicationInsightsProvider, Web.TPEngine, Version=1.0.0.0`. It sends event data directly to Application Insights by using the instrumentation key provided to Azure AD B2C.
3131

3232
A technical profile uses this provider to define an event from Azure AD B2C. The profile specifies the name of the event, the claims that are recorded, and the instrumentation key. To post an event, the technical profile is then added as an `orchestration step`, or as a `validation technical profile` in a custom user journey.
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.component: B2C
1717

1818
[!INCLUDE [active-directory-b2c-advanced-audience-warning](../../includes/active-directory-b2c-advanced-audience-warning.md)]
1919

20-
This article shows you how to enable sign-in for an ADFS user account by using [custom policies](active-directory-b2c-overview-custom.md) in Azure Active Directory (Azure AD) B2C.
20+
This article shows you how to enable sign-in for an ADFS user account by using [custom policies](active-directory-b2c-overview-custom.md) in Azure Active Directory (Azure AD) B2C. You enable sign-in by adding a [SAML technical profile](saml-technical-profile.md) to a custom policy.
2121

2222
## Prerequisites
2323

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,20 @@ Complete the steps in [Get started with custom policies in Azure Active Director
2727

2828
To enable sign-in for users from a specific Azure AD organization, you need to register an application within the organizational Azure AD tenant.
2929

30-
>[!NOTE]
31-
>`Contoso.com` is used for the organizational Azure AD tenant and `fabrikamb2c.onmicrosoft.com` is used as the Azure AD B2C tenant in the following instructions.
32-
3330
1. Sign in to the [Azure portal](https://portal.azure.com).
3431
2. Make sure you're using the directory that contains organizational Azure AD tenant (contoso.com) by clicking the **Directory and subscription filter** in the top menu and choosing the directory that contains your tenant.
3532
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
3633
4. Select **New application registration**.
3734
5. Enter a name for your application. For example, `Azure AD B2C App`.
3835
6. For the **Application type**, select `Web app / API`.
39-
7. For the **Sign-on URL**, enter the following URL in all lowercase letters, where `your-tenant` is replaced with the name of your Azure AD B2C tenant (fabrikamb2c.onmicrosoft.com):
36+
7. For the **Sign-on URL**, enter the following URL in all lowercase letters, where `your-B2C-tenant-name` is replaced with the name of your Azure AD B2C tenant:
4037

4138
```
42-
https://yourtenant.b2clogin.com/your-tenant.onmicrosoft.com/oauth2/authresp
39+
https://your-B2C-tenant-name.b2clogin.com/your-B2C-tenant-name.onmicrosoft.com/oauth2/authresp
4340
```
4441
42+
For example, `https://contoso.b2clogin.com/contoso.onmicrosoft.com/oauth2/authresp`.
43+
4544
8. Click **Create**. Copy the **Application ID** to be used later.
4645
9. Select the application, and then select **Settings**.
4746
10. Select **Keys**, enter the key description, select a duration, and then click **Save**. Copy the value of the key that is displayed to be used later.
@@ -81,7 +80,7 @@ You can define Azure AD as a claims provider by adding Azure AD to the **ClaimsP
8180
<Protocol Name="OpenIdConnect"/>
8281
<OutputTokenFormat>JWT</OutputTokenFormat>
8382
<Metadata>
84-
<Item Key="METADATA">https://login.windows.net/your-tenant/.well-known/openid-configuration</Item>
83+
<Item Key="METADATA">https://login.windows.net/your-AD-tenant-name.onmicrosoft.com/.well-known/openid-configuration</Item>
8584
<Item Key="ProviderName">https://sts.windows.net/00000000-0000-0000-0000-000000000000/</Item>
8685
<Item Key="client_id">00000000-0000-0000-0000-000000000000</Item>
8786
<Item Key="IdTokenAudience">00000000-0000-0000-0000-000000000000</Item>
@@ -115,7 +114,7 @@ You can define Azure AD as a claims provider by adding Azure AD to the **ClaimsP
115114
</ClaimsProvider>
116115
```
117116
118-
4. Under the **ClaimsProvider** element, update the value for **Domain** to a unique value that can be used to distinguish it from other identity providers.
117+
4. Under the **ClaimsProvider** element, update the value for **Domain** to a unique value that can be used to distinguish it from other identity providers. For example `Contoso`. You don't put a `.com` at the end of this domain setting.
119118
5. Under the **ClaimsProvider** element, update the value for **DisplayName** to a friendly name for the claims provider. This value is not currently used.
120119
121120
### Update the technical profile
@@ -126,7 +125,7 @@ To get a token from the Azure AD endpoint, you need to define the protocols that
126125
2. Update the value for **DisplayName**. This value will be displayed on the sign-in button on your sign-in screen.
127126
3. Update the value for **Description**.
128127
4. Azure AD uses the OpenID Connect protocol, so make sure that the value for **Protocol** is `OpenIdConnect`.
129-
5. Set value of the **METADATA** to `https://login.windows.net/your-tenant/.well-known/openid-configuration`, where `your-tenant` is your Azure AD tenant name (contoso.com).
128+
5. Set value of the **METADATA** to `https://login.windows.net/your-AD-tenant-name.onmicrosoft.com/.well-known/openid-configuration`, where `your-AD-tenant-name` is your Azure AD tenant name. For example, `https://login.windows.net/fabrikam.onmicrosoft.com/.well-known/openid-configuration`
130129
6. Open your browser and go to the **METADATA** URL that you just updated, look for the **issuer** object, copy and paste the value into the value for **ProviderName** in the XML file.
131130
8. Set **client_id** and **IdTokenAudience** to the application ID from the application registration.
132131
9. Under **CryptograhicKeys**, Update the value for **StorageReferenceId** to the policy key that you defined. For example, `ContosoAppSecret`.
@@ -154,7 +153,7 @@ At this point, the identity provider has been set up, but it’s not available i
154153
The **ClaimsProviderSelection** element is analogous to an identity provider button on a sign-up/sign-in screen. If you add a **ClaimsProviderSelection** element for Azure AD, a new button shows up when a user lands on the page.
155154
156155
1. Find the **OrchestrationStep** element that includes `Order="1"` in the user journey that you created.
157-
2. Under **ClaimsProviderSelects**, add the following element. Set the value of **TargetClaimsExchangeId** to an appropriate value, for example `ContosoExchange`:
156+
2. Under **ClaimsProviderSelections**, add the following element. Set the value of **TargetClaimsExchangeId** to an appropriate value, for example `ContosoExchange`:
158157
159158
```XML
160159
<ClaimsProviderSelection TargetClaimsExchangeId="ContosoExchange" />

0 commit comments

Comments
 (0)