Skip to content

Commit 3ae0983

Browse files
julieMSFTjulieMSFT
committed
Merge branch 'release-synapse-current' of https://github.com/MicrosoftDocs/azure-docs-pr into 20200519_mtm
2 parents 293291d + 77821b7 commit 3ae0983

File tree

698 files changed

+9997
-4455
lines changed

Some content is hidden

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

698 files changed

+9997
-4455
lines changed

‎.openpublishing.redirection.json

Lines changed: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/cosmos-db/sql-api-async-java-samples.md",
5+
"redirect_url": "/azure/cosmos-db/sql-api-java-sdk-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/cosmos-db/sql-api-java-samples.md",
10+
"redirect_url": "/azure/cosmos-db/sql-api-java-sdk-samples",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/openshift/howto-azure-monitor-v4.md",
515
"redirect_url": "articles/azure-monitor/insights/container-insights-azure-redhat4-setup.md",
@@ -756,6 +766,11 @@
756766
"redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
757767
"redirect_document_id": false
758768
},
769+
{
770+
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
771+
"redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
772+
"redirect_document_id": false
773+
},
759774
{
760775
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
761776
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -811,6 +826,12 @@
811826
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
812827
"redirect_document_id": false
813828
},
829+
830+
831+
{
832+
"source_path": "articles/cognitive-services/LUIS/tutorial-publish-settings.md",
833+
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity#publish-the-app-to-access-it-from-the-http-endpoint"
834+
},
814835
{
815836
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-composite-entity.md",
816837
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
@@ -875,7 +896,7 @@
875896
},
876897
{
877898
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-sentiment-analysis.md",
878-
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-publish-settings",
899+
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-publish-app",
879900
"redirect_document_id": false
880901
},
881902
{
@@ -2442,6 +2463,11 @@
24422463
"redirect_url": "/azure/cosmos-db/autoscale-faq",
24432464
"redirect_document_id": true
24442465
},
2466+
{
2467+
"source_path": "articles/cosmos-db/use-notebook-features-and-commands.md",
2468+
"redirect_url": "/azure/cosmos-db/use-python-notebook-features-and-commands",
2469+
"redirect_document_id": true
2470+
},
24452471
{
24462472
"source_path": "articles/cosmos-db/how-to-custom-synchronization.md",
24472473
"redirect_url": "/azure/cosmos-db/how-to-multi-master",
@@ -5386,12 +5412,12 @@
53865412
"source_path": "articles/event-grid/premium-basic-tiers.md",
53875413
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
53885414
"redirect_document_id": false
5389-
},
5415+
},
53905416
{
53915417
"source_path": "articles/event-grid/update-tier.md",
53925418
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
53935419
"redirect_document_id": false
5394-
},
5420+
},
53955421
{
53965422
"source_path": "articles/azure-resource-manager/resource-manager-samples-powershell-deploy.md",
53975423
"redirect_url": "/azure/azure-resource-manager/templates/deploy-powershell",
@@ -8033,7 +8059,7 @@
80338059
},
80348060
{
80358061
"source_path": "articles/azure-functions/functions-create-first-java-maven.md",
8036-
"redirect_url": "/azure/azure-functions/functions-create-first-java-gradle",
8062+
"redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?tabs=bash%2Cbrowser&pivots=programming-language-java",
80378063
"redirect_document_id": false
80388064
},
80398065
{
@@ -16120,7 +16146,7 @@
1612016146
"source_path": "articles/machine-learning/concept-event-grid-integration.md",
1612116147
"redirect_url": "/azure/machine-learning/how-to-use-event-grid",
1612216148
"redirect_document_id": false
16123-
},
16149+
},
1612416150
{
1612516151
"source_path": "articles/machine-learning/sample-designer-datasets.md",
1612616152
"redirect_url": "/azure/machine-learning/samples-designer",
@@ -17305,7 +17331,7 @@
1730517331
"source_path": "articles/service-bus-relay/network-security.md",
1730617332
"redirect_url": "/azure/azure-relay/network-security",
1730717333
"redirect_document_id": false
17308-
},
17334+
},
1730917335
{
1731017336
"source_path": "articles/service-bus-relay/private-link-service.md",
1731117337
"redirect_url": "/azure/azure-relay/private-link-service",
@@ -17380,12 +17406,12 @@
1738017406
"source_path": "articles/service-bus-relay/relay-migrate-acs-sas.md",
1738117407
"redirect_url": "/azure/azure-relay/relay-migrate-acs-sas",
1738217408
"redirect_document_id": false
17383-
},
17409+
},
1738417410
{
1738517411
"source_path": "articles/service-bus-relay/relay-port-settings.md",
1738617412
"redirect_url": "/azure/azure-relay/relay-port-settings",
1738717413
"redirect_document_id": false
17388-
},
17414+
},
1738917415
{
1739017416
"source_path": "articles/service-bus-relay/relay-what-is-it.md",
1739117417
"redirect_url": "/azure/azure-relay/relay-what-is-it",
@@ -17395,7 +17421,7 @@
1739517421
"source_path": "articles/service-bus-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay.md",
1739617422
"redirect_url": "/azure/azure-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay",
1739717423
"redirect_document_id": false
17398-
},
17424+
},
1739917425
{
1740017426
"source_path": "articles/service-bus-relay/service-bus-relay-rest-tutorial.md",
1740117427
"redirect_url": "/azure/azure-relay/service-bus-relay-rest-tutorial",
@@ -17410,7 +17436,7 @@
1741017436
"source_path": "articles/service-bus-relay/service-bus-relay-tutorial.md",
1741117437
"redirect_url": "/azure/azure-relay/service-bus-relay-tutorial",
1741217438
"redirect_document_id": false
17413-
},
17439+
},
1741417440
{
1741517441
"source_path": "articles/service-bus-relay/relay-wcf-dotnet-get-started.md",
1741617442
"redirect_url": "/azure/azure-relay/azure-relay-tutorial",
@@ -20255,7 +20281,7 @@
2025520281
"source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
2025620282
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
2025720283
"redirect_document_id": true
20258-
},
20284+
},
2025920285
{
2026020286
"source_path": "articles/marketplace/enable-lead-sharing.md",
2026120287
"redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
@@ -40265,6 +40291,16 @@
4026540291
"redirect_url": "/azure/governance/policy/samples/index",
4026640292
"redirect_document_id": false
4026740293
},
40294+
{
40295+
"source_path": "articles/governance/policy/concepts/rego-for-aks.md",
40296+
"redirect_url": "/azure/governance/policy/concepts/policy-for-kubernetes",
40297+
"redirect_document_id": false
40298+
},
40299+
{
40300+
"source_path": "articles/governance/policy/concepts/aks-engine.md",
40301+
"redirect_url": "/azure/governance/policy/concepts/policy-for-kubernetes",
40302+
"redirect_document_id": false
40303+
},
4026840304
{
4026940305
"source_path": "articles/azure-stack/azure-stack-tools-paas-services.md",
4027040306
"redirect_url": "/azure/azure-stack/azure-stack-offer-services-overview",
@@ -51570,7 +51606,7 @@
5157051606
},
5157151607
{
5157251608
"source_path": "articles/databox-online/data-box-edge-troubleshoot.md",
51573-
"redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
51609+
"redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
5157451610
"redirect_document_id": false
5157551611
},
5157651612
{
@@ -52167,6 +52203,11 @@
5216752203
"source_path": "articles/sql-database-edge/tutorial-sync-data-factory.md",
5216852204
"redirect_url": "/azure/azure-sql-edge/tutorial-sync-data-factory",
5216952205
"redirect_document_id": true
52170-
}
52206+
},
52207+
{
52208+
"source_path":"articles/azure-monitor/app/alerts.md",
52209+
"redirect_url":"/articles/azure-monitor/platform/alerts-log",
52210+
"redirect_document_id": false
52211+
}
5217152212
]
5217252213
}

‎articles/active-directory-b2c/connect-with-saml-service-providers.md

Lines changed: 1 addition & 3 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: reference
12-
ms.date: 03/20/2020
12+
ms.date: 05/18/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
ms.custom: fasttrack-edit
@@ -19,8 +19,6 @@ ms.custom: fasttrack-edit
1919

2020
In this article, you learn how to configure Azure Active Directory B2C (Azure AD B2C) to act as a Security Assertion Markup Language (SAML) identity provider (IdP) to your applications.
2121

22-
[!INCLUDE [active-directory-b2c-public-preview](../../includes/active-directory-b2c-public-preview.md)]
23-
2422
## Scenario overview
2523

2624
Organizations that use Azure AD B2C as their customer identity and access management solution might require interaction with identity providers or applications that are configured to authenticate using the SAML protocol.

‎articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 2 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: 04/28/2020
12+
ms.date: 05/19/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -65,7 +65,7 @@ Custom policy/Identity Experience Framework capabilities are under constant and
6565
| [OAuth2 implicit flow](implicit-flow-single-page-application.md) | | | X | |
6666
| [OAuth2 resource owner password credentials](ropc-custom.md) | | X | | |
6767
| [OIDC Connect](openid-connect.md) | | | X | |
68-
| [SAML2](connect-with-saml-service-providers.md) | |X | | POST and Redirect bindings. |
68+
| [SAML2](connect-with-saml-service-providers.md) | | |X | POST and Redirect bindings. |
6969
| OAuth1 | | | | Not supported. |
7070
| WSFED | X | | | |
7171

0 commit comments

Comments
 (0)