Skip to content

Commit 6d6bc9f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into freshness106
2 parents 9d6f757 + a4c256d commit 6d6bc9f

File tree

236 files changed

+2541
-2690
lines changed

Some content is hidden

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

236 files changed

+2541
-2690
lines changed

.openpublishing.redirection.json

Lines changed: 66 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4889,7 +4889,7 @@
48894889
"source_path": "articles/azure-functions/functions-bindings-external-file.md",
48904890
"redirect_url": "/azure/azure-functions/functions-triggers-bindings#supported-bindings",
48914891
"redirect_document_id": false
4892-
},
4892+
},
48934893
{
48944894
"source_path": "articles/azure-functions/functions-create-vnet-old.md",
48954895
"redirect_url": "/azure/azure-functions/functions-create-vnet",
@@ -11045,11 +11045,6 @@
1104511045
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
1104611046
"redirect_document_id": false
1104711047
},
11048-
{
11049-
"source_path": "articles/event-hubs/event-hubs-dedicated-cluster-create-portal.md",
11050-
"redirect_url": "/azure/event-hubs/event-hubs-dedicated-overview",
11051-
"redirect_document_id": false
11052-
},
1105311048
{
1105411049
"source_path": "articles/event-hubs/event-hubs-dotnet-framework-getstarted-receive-eph.md",
1105511050
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
@@ -13769,12 +13764,12 @@
1376913764
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-portal.md",
1377013765
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
1377113766
"redirect_document_id": false
13772-
},
13767+
},
1377313768
{
1377413769
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-powershell.md",
1377513770
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
1377613771
"redirect_document_id": false
13777-
},
13772+
},
1377813773
{
1377913774
"source_path": "articles/sql-data-warehouse/sql-data-warehouse-restore-database-rest-api.md",
1378013775
"redirect_url": "/azure/sql-data-warehouse/sql-data-warehouse-restore",
@@ -27685,7 +27680,7 @@
2768527680
"redirect_document_id": false
2768627681
},
2768727682
{
27688-
"source_path": "articles/sql-data-warehouse/release-notes.md",
27683+
"source_path": "articles/sql-data-warehouse/release-notes.md",
2768927684
"redirect_url": "/azure/sql-data-warehouse/release-notes-10-0-10106-0",
2769027685
"redirect_document_id": false
2769127686
},
@@ -36472,7 +36467,7 @@
3647236467
"source_path": "articles/cognitive-services/personalizer/personalizer-container-howto.md",
3647336468
"redirect_url": "/azure/cognitive-services/personalizer/what-is-personalizer",
3647436469
"redirect_document_id": false
36475-
},
36470+
},
3647636471
{
3647736472
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-intent-and-key-phrase.md",
3647836473
"redirect_url": "/azure/cognitive-services/LUIS/luis-reference-prebuilt-keyphrase",
@@ -39558,10 +39553,70 @@
3955839553
"redirect_url": "/azure/active-directory-domain-services/troubleshoot",
3955939554
"redirect_document_id": false
3956039555
},
39556+
{
39557+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-detect.md",
39558+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-Ruby",
39559+
"redirect_document_id": false
39560+
},
39561+
{
39562+
"source_path": "articles/cognitive-services/translator/quickstart-ruby-dictionary.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-languages.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-sentences.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-translate.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-transliterate.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-php-detect.md",
39588+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39589+
"redirect_document_id": false
39590+
},
39591+
{
39592+
"source_path": "articles/cognitive-services/translator/quickstart-php-dictionary.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-languages.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-sentences.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-translate.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-transliterate.md",
39613+
"redirect_url": "https://github.com/MicrosoftTranslator/Text-Translation-API-V3-PHP",
39614+
"redirect_document_id": false
39615+
},
3956139616
{
3956239617
"source_path": "articles/backup/backup-azure-upgrade-backup-to-recovery-services.md",
3956339618
"redirect_url": "/azure/backup/backup-create-rs-vault",
3956439619
"redirect_document_id": true
39565-
}
39620+
}
3956639621
]
3956739622
}

articles/active-directory/authentication/howto-authentication-phone-sign-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ One of the prerequisites to create this new, strong credential, is that the devi
8686
8787
## Next steps
8888
89-
[Learn about device registration](../devices/overview.md#getting-devices-under-the-control-of-azure-ad)
89+
[Learn about device registration](../devices/overview.md#getting-devices-in-azure-ad)
9090
9191
[Learn about Azure Multi-Factor Authentication](../authentication/howto-mfa-getstarted.md)

articles/active-directory/develop/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
items:
5656
- name: .NET Core console (daemon)
5757
href: quickstart-v2-netcore-daemon.md
58-
- name: ASP.NET daemon Web app
58+
- name: ASP.NET daemon web app
5959
href: https://github.com/Azure-Samples/active-directory-dotnet-daemon-v2
6060
- name: Tutorials
6161
items:

articles/active-directory/develop/about-microsoft-identity-platform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.devlang: na
1313
ms.topic: overview
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 05/07/2019
16+
ms.date: 06/03/2019
1717
ms.author: ryanwi
1818
ms.reviewer: agirling, saeeda, benv
1919
ms.custom: aaddev

0 commit comments

Comments
 (0)