Skip to content

Commit d37faee

Browse files
authored
Merge branch 'master' into master
2 parents 58e06d3 + 3a09d94 commit d37faee

File tree

1,706 files changed

+22839
-11782
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,706 files changed

+22839
-11782
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@
419419
"url": "https://github.com/Azure/azure-cosmos-dotnet-v2",
420420
"branch": "master"
421421
},
422+
{
423+
"path_to_root": "samples-cosmosdb-java-v4-web-app",
424+
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
425+
"branch": "master"
426+
},
422427
{
423428
"path_to_root": "samples-cosmosdb-dotnet-change-feed-processor",
424429
"url": "https://github.com/Azure-Samples/cosmos-dotnet-change-feed-processor",

.openpublishing.redirection.json

Lines changed: 130 additions & 14 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",
@@ -741,6 +751,11 @@
741751
"redirect_url": "/azure/machine-learning/samples-notebooks",
742752
"redirect_document_id": false
743753
},
754+
{
755+
"source_path": "articles/cognitive-services/cognitive-services-gating-process.md",
756+
"redirect_url": "/azure/cognitive-services/cognitive-services-container-support",
757+
"redirect_document_id": false
758+
},
744759
{
745760
"source_path": "articles/cognitive-services/Content-Moderator/dotnet-sdk-quickstart.md",
746761
"redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-csharp",
@@ -756,6 +771,11 @@
756771
"redirect_url": "/azure/cognitive-services/Content-Moderator/client-libraries?pivots=programming-language-python",
757772
"redirect_document_id": false
758773
},
774+
{
775+
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/integrate-qnamaker-luis.md",
776+
"redirect_url": "/azure/cognitive-services/luis/choose-natural-language-processing-service",
777+
"redirect_document_id": false
778+
},
759779
{
760780
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
761781
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -811,6 +831,12 @@
811831
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
812832
"redirect_document_id": false
813833
},
834+
835+
836+
{
837+
"source_path": "articles/cognitive-services/LUIS/tutorial-publish-settings.md",
838+
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity#publish-the-app-to-access-it-from-the-http-endpoint"
839+
},
814840
{
815841
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-composite-entity.md",
816842
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities"
@@ -875,7 +901,7 @@
875901
},
876902
{
877903
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-sentiment-analysis.md",
878-
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-publish-settings",
904+
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-publish-app",
879905
"redirect_document_id": false
880906
},
881907
{
@@ -2077,6 +2103,16 @@
20772103
"redirect_url": "/azure/virtual-machines/windows/publish-web-app-from-visual-studio",
20782104
"redirect_document_id": true
20792105
},
2106+
{
2107+
"source_path": "articles/virtual-machine-scale-sets/cli-samples.md",
2108+
"redirect_url": "azure/virtual-machine-scale-sets/scripts/cli-sample-create-simple-scale-set",
2109+
"redirect_document_id": false
2110+
},
2111+
{
2112+
"source_path": "articles/virtual-machine-scale-sets/powershell-samples.md",
2113+
"redirect_url": "azure/virtual-machine-scale-sets/scripts/powershell-sample-create-simple-scale-set",
2114+
"redirect_document_id": false
2115+
},
20802116
{
20812117
"source_path": "articles/frontdoor/front-door-rest-api.md",
20822118
"redirect_url": "/rest/api/frontdoor",
@@ -2442,6 +2478,11 @@
24422478
"redirect_url": "/azure/cosmos-db/autoscale-faq",
24432479
"redirect_document_id": true
24442480
},
2481+
{
2482+
"source_path": "articles/cosmos-db/use-notebook-features-and-commands.md",
2483+
"redirect_url": "/azure/cosmos-db/use-python-notebook-features-and-commands",
2484+
"redirect_document_id": true
2485+
},
24452486
{
24462487
"source_path": "articles/cosmos-db/how-to-custom-synchronization.md",
24472488
"redirect_url": "/azure/cosmos-db/how-to-multi-master",
@@ -2812,6 +2853,11 @@
28122853
"redirect_url": "/azure/cosmos-db/high-availability",
28132854
"redirect_document_id": true
28142855
},
2856+
{
2857+
"source_path": "articles/cosmos-db/create-mongodb-golang.md",
2858+
"redirect_url": "/azure/cosmos-db/create-mongodb-go",
2859+
"redirect_document_id": true
2860+
},
28152861
{
28162862
"source_path": "articles/cosmos-db/sql-api-dotnet-application-preview.md",
28172863
"redirect_url": "/azure/cosmos-db/sql-api-dotnet-application",
@@ -5381,12 +5427,12 @@
53815427
"source_path": "articles/event-grid/premium-basic-tiers.md",
53825428
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
53835429
"redirect_document_id": false
5384-
},
5430+
},
53855431
{
53865432
"source_path": "articles/event-grid/update-tier.md",
53875433
"redirect_url": "https://azure.microsoft.com/pricing/details/event-grid/",
53885434
"redirect_document_id": false
5389-
},
5435+
},
53905436
{
53915437
"source_path": "articles/azure-resource-manager/resource-manager-samples-powershell-deploy.md",
53925438
"redirect_url": "/azure/azure-resource-manager/templates/deploy-powershell",
@@ -8028,7 +8074,7 @@
80288074
},
80298075
{
80308076
"source_path": "articles/azure-functions/functions-create-first-java-maven.md",
8031-
"redirect_url": "/azure/azure-functions/functions-create-first-java-gradle",
8077+
"redirect_url": "/azure/azure-functions/functions-create-first-azure-function-azure-cli?tabs=bash%2Cbrowser&pivots=programming-language-java",
80328078
"redirect_document_id": false
80338079
},
80348080
{
@@ -16115,7 +16161,7 @@
1611516161
"source_path": "articles/machine-learning/concept-event-grid-integration.md",
1611616162
"redirect_url": "/azure/machine-learning/how-to-use-event-grid",
1611716163
"redirect_document_id": false
16118-
},
16164+
},
1611916165
{
1612016166
"source_path": "articles/machine-learning/sample-designer-datasets.md",
1612116167
"redirect_url": "/azure/machine-learning/samples-designer",
@@ -17300,7 +17346,7 @@
1730017346
"source_path": "articles/service-bus-relay/network-security.md",
1730117347
"redirect_url": "/azure/azure-relay/network-security",
1730217348
"redirect_document_id": false
17303-
},
17349+
},
1730417350
{
1730517351
"source_path": "articles/service-bus-relay/private-link-service.md",
1730617352
"redirect_url": "/azure/azure-relay/private-link-service",
@@ -17375,12 +17421,12 @@
1737517421
"source_path": "articles/service-bus-relay/relay-migrate-acs-sas.md",
1737617422
"redirect_url": "/azure/azure-relay/relay-migrate-acs-sas",
1737717423
"redirect_document_id": false
17378-
},
17424+
},
1737917425
{
1738017426
"source_path": "articles/service-bus-relay/relay-port-settings.md",
1738117427
"redirect_url": "/azure/azure-relay/relay-port-settings",
1738217428
"redirect_document_id": false
17383-
},
17429+
},
1738417430
{
1738517431
"source_path": "articles/service-bus-relay/relay-what-is-it.md",
1738617432
"redirect_url": "/azure/azure-relay/relay-what-is-it",
@@ -17390,7 +17436,7 @@
1739017436
"source_path": "articles/service-bus-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay.md",
1739117437
"redirect_url": "/azure/azure-relay/service-bus-dotnet-hybrid-app-using-service-bus-relay",
1739217438
"redirect_document_id": false
17393-
},
17439+
},
1739417440
{
1739517441
"source_path": "articles/service-bus-relay/service-bus-relay-rest-tutorial.md",
1739617442
"redirect_url": "/azure/azure-relay/service-bus-relay-rest-tutorial",
@@ -17405,7 +17451,7 @@
1740517451
"source_path": "articles/service-bus-relay/service-bus-relay-tutorial.md",
1740617452
"redirect_url": "/azure/azure-relay/service-bus-relay-tutorial",
1740717453
"redirect_document_id": false
17408-
},
17454+
},
1740917455
{
1741017456
"source_path": "articles/service-bus-relay/relay-wcf-dotnet-get-started.md",
1741117457
"redirect_url": "/azure/azure-relay/azure-relay-tutorial",
@@ -17761,6 +17807,16 @@
1776117807
"redirect_url": "/azure/synapse-analytics/quickstart-apache-spark-notebook",
1776217808
"redirect_document_id": true
1776317809
},
17810+
{
17811+
"source_path": "articles/synapse-analytics/quickstart-create-apache-spark-pool.md",
17812+
"redirect_url": "/azure/synapse-analytics/quickstart-create-apache-spark-pool-portal",
17813+
"redirect_document_id": false
17814+
},
17815+
{
17816+
"source_path": "articles/synapse-analytics/quickstart-create-sql-pool.md",
17817+
"redirect_url": "/azure/synapse-analytics/quickstart-create-sql-pool-portal",
17818+
"redirect_document_id": false
17819+
},
1776417820
{
1776517821
"source_path": "articles/sql-database/sql-database-auditing-get-started.md",
1776617822
"redirect_url": "/azure/sql-database/sql-database-auditing",
@@ -20240,7 +20296,7 @@
2024020296
"source_path": "articles/marketplace/cloud-partner-portal-orig/setup-your-application-in-the-publishing-portal.md",
2024120297
"redirect_url": "/azure/marketplace/partner-center-portal/create-new-customer-engagement-offer",
2024220298
"redirect_document_id": true
20243-
},
20299+
},
2024420300
{
2024520301
"source_path": "articles/marketplace/enable-lead-sharing.md",
2024620302
"redirect_url": "/azure/marketplace/partner-center-portal/commercial-marketplace-get-customer-leads",
@@ -40250,6 +40306,16 @@
4025040306
"redirect_url": "/azure/governance/policy/samples/index",
4025140307
"redirect_document_id": false
4025240308
},
40309+
{
40310+
"source_path": "articles/governance/policy/concepts/rego-for-aks.md",
40311+
"redirect_url": "/azure/governance/policy/concepts/policy-for-kubernetes",
40312+
"redirect_document_id": false
40313+
},
40314+
{
40315+
"source_path": "articles/governance/policy/concepts/aks-engine.md",
40316+
"redirect_url": "/azure/governance/policy/concepts/policy-for-kubernetes",
40317+
"redirect_document_id": false
40318+
},
4025340319
{
4025440320
"source_path": "articles/azure-stack/azure-stack-tools-paas-services.md",
4025540321
"redirect_url": "/azure/azure-stack/azure-stack-offer-services-overview",
@@ -44200,6 +44266,51 @@
4420044266
"redirect_url": "/azure/hdinsight/hadoop/apache-hadoop-use-pig-ssh",
4420144267
"redirect_document_id": false
4420244268
},
44269+
{
44270+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-prerequisites.md",
44271+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44272+
"redirect_document_id": false
44273+
},
44274+
{
44275+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-create-offer.md",
44276+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44277+
"redirect_document_id": false
44278+
},
44279+
{
44280+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-offer-settings-tab.md",
44281+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44282+
"redirect_document_id": false
44283+
},
44284+
{
44285+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-skus-tab.md",
44286+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44287+
"redirect_document_id": false
44288+
},
44289+
{
44290+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-marketplace-tab.md",
44291+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44292+
"redirect_document_id": false
44293+
},
44294+
{
44295+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-support-tab.md",
44296+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44297+
"redirect_document_id": false
44298+
},
44299+
{
44300+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-create-technical-assets.md",
44301+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-technical-assets",
44302+
"redirect_document_id": false
44303+
},
44304+
{
44305+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-publish-offer.md",
44306+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44307+
"redirect_document_id": false
44308+
},
44309+
{
44310+
"source_path": "articles/marketplace/cloud-partner-portal/containers/cpp-update-existing-offer.md",
44311+
"redirect_url": "/azure/marketplace/partner-center-portal/create-azure-container-offer",
44312+
"redirect_document_id": false
44313+
},
4420344314
{
4420444315
"source_path": "articles/cognitive-services/LUIS/sdk-csharp-3x.md",
4420544316
"redirect_url": "/azure/cognitive-services/LUIS/sdk-authoring.md",
@@ -51555,7 +51666,7 @@
5155551666
},
5155651667
{
5155751668
"source_path": "articles/databox-online/data-box-edge-troubleshoot.md",
51558-
"redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
51669+
"redirect_url": "/azure/databox-online/azure-stack-edge-troubleshoot",
5155951670
"redirect_document_id": false
5156051671
},
5156151672
{
@@ -51925,7 +52036,7 @@
5192552036
},
5192652037
{
5192752038
"source_path": "articles/terraform/terraform-create-complete-vm.md",
51928-
"redirect_url": "/azure/developer/terraform/create-linux-virtual machine-with-infrastructure",
52039+
"redirect_url": "/azure/developer/terraform/create-linux-virtual-machine-with-infrastructure",
5192952040
"redirect_document_id": false
5193052041
},
5193152042
{
@@ -52152,6 +52263,11 @@
5215252263
"source_path": "articles/sql-database-edge/tutorial-sync-data-factory.md",
5215352264
"redirect_url": "/azure/azure-sql-edge/tutorial-sync-data-factory",
5215452265
"redirect_document_id": true
52155-
}
52266+
},
52267+
{
52268+
"source_path":"articles/azure-monitor/app/alerts.md",
52269+
"redirect_url":"/articles/azure-monitor/platform/alerts-log",
52270+
"redirect_document_id": false
52271+
}
5215652272
]
5215752273
}

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"YAML"
6060
],
6161
"cSpell.words": [
62-
"auditd"
62+
"auditd",
63+
"covid"
6364
],
6465
"git.ignoreLimitWarning": true
6566
}

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

Lines changed: 1 addition & 4 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.
@@ -367,7 +365,6 @@ The following SAML relying party (RP) scenarios are supported via your own metad
367365
* Multiple logout URLs or POST binding for logout URL in application/service principal object.
368366
* Specify signing key to verify RP requests in application/service principal object.
369367
* Specify token encryption key in application/service principal object.
370-
* Identity provider-initiated logins are not currently supported in the preview release.
371368

372369
## Next steps
373370

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

articles/active-directory-b2c/custom-policy-rest-api-claims-exchange.md

Lines changed: 1 addition & 4 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: 03/26/2020
11+
ms.date: 05/18/2020
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
---
@@ -207,9 +207,6 @@ Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensi
207207
}
208208
```
209209

210-
## Next steps
211-
212-
213210
## Next steps
214211

215212
To learn how to secure your APIs, see the following articles:

0 commit comments

Comments
 (0)