Skip to content

Commit bea9f3d

Browse files
author
dksimpson
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into DKS-US1712683-bing-visual-search
2 parents e1f8601 + 878e106 commit bea9f3d

File tree

557 files changed

+8784
-4278
lines changed

Some content is hidden

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

557 files changed

+8784
-4278
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"[email protected]"
2727
],
2828
"sync_notification_subscribers": [
29-
"tysonn@microsoft.com"
29+
"angrobe_extended_dir@microsoft.com"
3030
],
3131
"branches_to_filter": [],
3232
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
@@ -439,6 +439,11 @@
439439
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-xamarin-getting-started",
440440
"branch": "master"
441441
},
442+
{
443+
"path_to_root": "cosmosdb-python-sdk",
444+
"url": "https://github.com/Azure/azure-sdk-for-python/",
445+
"branch": "master"
446+
},
442447
{
443448
"path_to_root": "cosmosdb-nodejs-get-started",
444449
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",

‎.openpublishing.redirection.json

Lines changed: 65 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,11 @@
781781
"redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
782782
"redirect_document_id": false
783783
},
784+
{
785+
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-list-entity.md",
786+
"redirect_url": "/azure/cognitive-services/luis/reference-entity-list",
787+
"redirect_document_id": false
788+
},
784789
{
785790
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
786791
"redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
@@ -2500,12 +2505,12 @@
25002505
},
25012506
{
25022507
"source_path": "articles/cosmos-db/analytics-usecases.md",
2503-
"redirect_url": "/azure/cosmos-db/synapse-link",
2508+
"redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
25042509
"redirect_document_id": true
25052510
},
25062511
{
25072512
"source_path": "articles/cosmos-db/analytics-solution-architectures.md",
2508-
"redirect_url": "/azure/cosmos-db/synapse-link",
2513+
"redirect_url": "/azure/cosmos-db/synapse-link-use-cases",
25092514
"redirect_document_id": false
25102515
},
25112516
{
@@ -2515,7 +2520,7 @@
25152520
},
25162521
{
25172522
"source_path": "articles/cosmos-db/globally-distributed-transactional-analytical-storage.md",
2518-
"redirect_url": "/azure/cosmos-db/synapse-link",
2523+
"redirect_url": "/azure/cosmos-db/analytical-store-introduction",
25192524
"redirect_document_id": false
25202525
},
25212526
{
@@ -40828,7 +40833,7 @@
4082840833
},
4082940834
{
4083040835
"source_path": "articles/monitoring/monitoring-solutions-inventory.md",
40831-
"redirect_url": "/azure/azure-monitor/insights/solutions-inventory",
40836+
"redirect_url": "/azure/azure-monitor/monitor-reference",
4083240837
"redirect_document_id": false
4083340838
},
4083440839
{
@@ -41693,8 +41698,8 @@
4169341698
},
4169441699
{
4169541700
"source_path": "articles/log-analytics/powershell-samples.md",
41696-
"redirect_url": "/azure/azure-monitor/platform/powershell-samples",
41697-
"redirect_document_id": true
41701+
"redirect_url": "/azure/azure-monitor/samples/powershell-samples",
41702+
"redirect_document_id": false
4169841703
},
4169941704
{
4170041705
"source_path": "articles/monitoring-and-diagnostics/alert-log.md",
@@ -41833,7 +41838,7 @@
4183341838
},
4183441839
{
4183541840
"source_path": "articles/monitoring-and-diagnostics/insights-cli-samples.md",
41836-
"redirect_url": "/azure/azure-monitor/platform/cli-samples",
41841+
"redirect_url": "/azure/azure-monitor/samples/cli-samples",
4183741842
"redirect_document_id": true
4183841843
},
4183941844
{
@@ -42719,7 +42724,7 @@
4271942724
{
4272042725
"source_path": "articles/application-insights/app-insights-usage-workbooks.md",
4272142726
"redirect_url": "/azure/azure-monitor/app/usage-workbooks",
42722-
"redirect_document_id": true
42727+
"redirect_document_id": false
4272342728
},
4272442729
{
4272542730
"source_path": "articles/application-insights/app-insights-visual-studio-codelens.md",
@@ -43001,6 +43006,41 @@
4300143006
"redirect_url": "/azure/azure-monitor/platform/activity-log-collect",
4300243007
"redirect_document_id": false
4300343008
},
43009+
{
43010+
"source_path": "articles/azure-monitor/learn/quick-create-workspace-posh.md",
43011+
"redirect_url": "/azure/azure-monitor/platform/powershell-workspace-configuration",
43012+
"redirect_document_id": false
43013+
},
43014+
{
43015+
"source_path": "articles/azure-monitor/platform/powershell-quickstart-samples.md",
43016+
"redirect_url": "/azure/azure-monitor/platform/powershell-samples",
43017+
"redirect_document_id": false
43018+
},
43019+
{
43020+
"source_path": "articles/azure-monitor/platform/cli-samples.md",
43021+
"redirect_url": "/azure/azure-monitor/samples/cli-samples",
43022+
"redirect_document_id": false
43023+
},
43024+
{
43025+
"source_path": "articles/azure-monitor/azure-management.md",
43026+
"redirect_url": "/azure/azure-monitor/overview",
43027+
"redirect_document_id": false
43028+
},
43029+
{
43030+
"source_path": "articles/azure-monitor/insights/solutions-inventory.md",
43031+
"redirect_url": "/azure/azure-monitor/monitor-reference",
43032+
"redirect_document_id": false
43033+
},
43034+
{
43035+
"source_path": "articles/azure-monitor/policy-samples.md",
43036+
"redirect_url": "/azure/azure-monitor/samples/policy-samples",
43037+
"redirect_document_id": false
43038+
},
43039+
{
43040+
"source_path": "articles/azure-monitor/platform/powershell-samples.md",
43041+
"redirect_url": "/azure/azure-monitor/samples/powershell-samples",
43042+
"redirect_document_id": false
43043+
},
4300443044
{
4300543045
"source_path": "articles/machine-learning/service/how-to-automated-ml.md",
4300643046
"redirect_url": "/azure/machine-learning/service/concept-automated-ml",
@@ -52428,12 +52468,26 @@
5242852468
"source_path": "articles/sql-database/sql-database-auditing-and-threat-detection-powershell.md",
5242952469
"redirect_url": "/azure/sql-database/scripts/sql-database-auditing-and-threat-detection-powershell",
5243052470
"redirect_document_id": true
52431-
},
52432-
{
52471+
},
52472+
{
5243352473
"source_path": "articles/cdn/endpoint-multiorigin.md",
5243452474
"redirect_url": "/azure/cdn/cdn-overview",
5243552475
"redirect_document_id": false
52476+
},
52477+
{
52478+
"source_path": "articles/azure-monitor/app/usage-workbooks.md",
52479+
"redirect_url": "/azure/azure-monitor/platform/workbooks-overview",
52480+
"redirect_document_id": false
52481+
},
52482+
{
52483+
"source_path": "articles/batch/batch-api-basics.md",
52484+
"redirect_url": "/azure/batch/batch-service-workflow-features",
52485+
"redirect_document_id": false
52486+
},
52487+
{
52488+
"source_path": "articles/batch/batch-retry-after-errors.md",
52489+
"redirect_url": "/azure/batch/error-handling",
52490+
"redirect_document_id": false
5243652491
}
52437-
5243852492
]
5243952493
}

‎articles/active-directory-b2c/tokens-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 05/12/2020
11+
ms.date: 05/21/2020
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
---
@@ -33,8 +33,8 @@ The following tokens are used in communication with Azure AD B2C:
3333

3434
A [registered application](tutorial-register-applications.md) receives tokens and communicates with Azure AD B2C by sending requests to these endpoints:
3535

36-
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/oauth2/v2.0/authorize`
37-
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/oauth2/v2.0/token`
36+
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/authorize`
37+
- `https://<tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token`
3838

3939
Security tokens that your application receives from Azure AD B2C can come from the `/authorize` or `/token` endpoints. When ID tokens are acquired from the `/authorize` endpoint, it's done using the [implicit flow](implicit-flow-single-page-application.md), which is often used for users signing in to JavaScript-based web applications. When ID tokens are acquired from the `/token` endpoint, it's done using the [authorization code flow](openid-connect.md#get-a-token), which keeps the token hidden from the browser.
4040

‎articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,10 +1224,6 @@ To help drive awareness and demand of our joint integration, we recommend you up
12241224
)
12251225
* **Customer communication.** Alert customers of the new integration through your customer communication (monthly newsletters, email campaigns, product release notes).
12261226

1227-
### Allow IP addresses used by the Azure AD provisioning service to make SCIM requests
1228-
1229-
Certain apps allow inbound traffic to their app. In order for the Azure AD provisioning service to function as expected, the IP addresses used must be allowed. For a list of IP addresses for each service tag/region, see the JSON file - [Azure IP Ranges and Service Tags – Public Cloud](https://www.microsoft.com/download/details.aspx?id=56519). You can download and program these IPs into your firewall as needed. The reserved IP ranges for Azure AD provisioning can be found under "AzureActiveDirectoryDomainServices."
1230-
12311227
## Related articles
12321228

12331229
* [Automate user provisioning and deprovisioning to SaaS apps](user-provisioning.md)

0 commit comments

Comments
 (0)