Skip to content

Commit ac5a239

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into service-fabric-scenarios-and-scaling
2 parents b790df9 + 66ad4eb commit ac5a239

File tree

247 files changed

+5421
-5018
lines changed

Some content is hidden

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

247 files changed

+5421
-5018
lines changed

.openpublishing.redirection.json

Lines changed: 71 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3430,6 +3430,11 @@
34303430
"redirect_url": "/azure/azure-resource-manager/resource-group-authenticate-service-principal",
34313431
"redirect_document_id": false
34323432
},
3433+
{
3434+
"source_path": "articles/active-directory/develop/msal-testing.md",
3435+
"redirect_url": "/azure/active-directory/develop/msal-overview",
3436+
"redirect_document_id": true
3437+
},
34333438
{
34343439
"source_path": "articles/azure-resource-manager/resource-group-authenticate-service-principal.md",
34353440
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
@@ -4884,7 +4889,7 @@
48844889
"source_path": "articles/azure-functions/functions-bindings-external-file.md",
48854890
"redirect_url": "/azure/azure-functions/functions-triggers-bindings#supported-bindings",
48864891
"redirect_document_id": false
4887-
},
4892+
},
48884893
{
48894894
"source_path": "articles/azure-functions/functions-create-vnet-old.md",
48904895
"redirect_url": "/azure/azure-functions/functions-create-vnet",
@@ -13764,12 +13769,12 @@
1376413769
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-portal.md",
1376513770
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
1376613771
"redirect_document_id": false
13767-
},
13772+
},
1376813773
{
1376913774
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-powershell.md",
1377013775
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
1377113776
"redirect_document_id": false
13772-
},
13777+
},
1377313778
{
1377413779
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-rest-api.md",
1377513780
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
@@ -27680,7 +27685,7 @@
2768027685
"redirect_document_id": false
2768127686
},
2768227687
{
27683-
"source_path": "articles/sql-data-warehouse/release-notes.md",
27688+
"source_path": "articles/sql-data-warehouse/release-notes.md",
2768427689
"redirect_url": "/azure/sql-data-warehouse/release-notes-10-0-10106-0",
2768527690
"redirect_document_id": false
2768627691
},
@@ -36467,7 +36472,7 @@
3646736472
"source_path": "articles/cognitive-services/personalizer/personalizer-container-howto.md",
3646836473
"redirect_url": "/azure/cognitive-services/personalizer/what-is-personalizer",
3646936474
"redirect_document_id": false
36470-
},
36475+
},
3647136476
{
3647236477
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-key-phrase.md",
3647336478
"redirect_url": "/azure/cognitive-services/LUIS/luis-reference-prebuilt-keyphrase",
@@ -39553,10 +39558,70 @@
3955339558
"redirect_url": "/azure/active-directory-domain-services/troubleshoot",
3955439559
"redirect_document_id": false
3955539560
},
39561+
{
39562+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-detect.md",
39563+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39564+
"redirect_document_id": false
39565+
},
39566+
{
39567+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-dictionary.md",
39568+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39569+
"redirect_document_id": false
39570+
},
39571+
{
39572+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-languages.md",
39573+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39574+
"redirect_document_id": false
39575+
},
39576+
{
39577+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-sentences.md",
39578+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39579+
"redirect_document_id": false
39580+
},
39581+
{
39582+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-translate.md",
39583+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39584+
"redirect_document_id": false
39585+
},
39586+
{
39587+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-transliterate.md",
39588+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39589+
"redirect_document_id": false
39590+
},
39591+
{
39592+
"source_path": "articles/cognitive-services/translator/quickstart-php-detect.md",
39593+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39594+
"redirect_document_id": false
39595+
},
39596+
{
39597+
"source_path": "articles/cognitive-services/translator/quickstart-php-dictionary.md",
39598+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39599+
"redirect_document_id": false
39600+
},
39601+
{
39602+
"source_path": "articles/cognitive-services/translator/quickstart-php-languages.md",
39603+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39604+
"redirect_document_id": false
39605+
},
39606+
{
39607+
"source_path": "articles/cognitive-services/translator/quickstart-php-sentences.md",
39608+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39609+
"redirect_document_id": false
39610+
},
39611+
{
39612+
"source_path": "articles/cognitive-services/translator/quickstart-php-translate.md",
39613+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39614+
"redirect_document_id": false
39615+
},
39616+
{
39617+
"source_path": "articles/cognitive-services/translator/quickstart-php-transliterate.md",
39618+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39619+
"redirect_document_id": false
39620+
},
3955639621
{
3955739622
"source_path": "articles/backup/backup-azure-upgrade-backup-to-recovery-services.md",
3955839623
"redirect_url": "/azure/backup/backup-create-rs-vault",
3955939624
"redirect_document_id": true
39560-
}
39625+
}
3956139626
]
3956239627
}

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
@@ -140,7 +140,7 @@ Now that you have a button in place, you need to link it to an action. The actio
140140
To use ADFS as an identity provider in Azure AD B2C, you need to create an ADFS Relying Party Trust with the Azure AD B2C SAML metadata. The following example shows a URL address to the SAML metadata of an Azure AD B2C technical profile:
141141

142142
```
143-
https://login.microsoftonline.com/te/your-tenant/your-policy/samlp/metadata?idptp=your-technical-profile
143+
https://your-tenant-name.b2clogin.com/your-tenant-name/your-policy/samlp/metadata?idptp=your-technical-profile
144144
```
145145
146146
Replace the following values:

articles/active-directory/develop/TOC.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,7 @@
228228
- name: Initialize applications (JS)
229229
href: msal-js-initializing-client-applications.md
230230
- name: Handle errors and exceptions
231-
href: msal-handling-exceptions.md
232-
- name: Test MSAL applications
233-
href: msal-testing.md
231+
href: msal-handling-exceptions.md
234232
- name: Logging
235233
href: msal-logging.md
236234
- name: Single sign-on (JS)

0 commit comments

Comments
 (0)