Merge pull request #3 from MicrosoftDocs/master

Merge from MicrosoftDocs

Author: Xin Shi

.markdownlint.json

@@ -32,12 +32,10 @@
     "MD035": false,
     "MD036": false,
     "MD037": false,
-    "MD038": false,
-    "MD039": false,
     "MD040": false,
     "MD041": false,
     "MD042": false,
     "MD045": false,
     "MD046": false,
     "MD047": false
-}
+}

.openpublishing.publish.config.json

@@ -40,6 +40,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "resourcemanager-templates",
+      "url": "https://github.com/Azure/azure-docs-json-samples",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
@@ -376,7 +382,7 @@
   "need_generate_pdf_url_template": true,
   "targets": {
     "Pdf": {
-      "template_folder": "_themes.pdf"	
+      "template_folder": "_themes.pdf"
     }
   }
 }

.openpublishing.redirection.json

@@ -24,6 +24,11 @@
       "source_path": "articles/best-practices-network-security.md",
       "redirect_url": "https://docs.microsoft.com/azure/architecture/vdc/networking-virtual-datacenter",
       "redirect_document_id": true
+    },
+	{
+      "source_path": "articles/active-directory/saas-apps/realtimeboard-tutorial.md",
+      "redirect_url": "/articles/active-directory/saas-apps/miro-tutorial",
+      "redirect_document_id": true
     },
     {
       "source_path": "articles/virtual-network/virtual-networks-dmz-nsg-asm.md",
@@ -1491,8 +1496,8 @@
       "redirect_document_id": true
     },
     {
-      "source_path": "articles/cosmos-db/sql-api-sql-query-reference.md",
-      "redirect_url": "/azure/cosmos-db/sql-api-query-reference",
+      "source_path": "articles/cosmos-db/sql-api-query-reference.md",
+      "redirect_url": "/azure/cosmos-db/sql-query-getting-started",
       "redirect_document_id": true
     },
     {
@@ -1532,7 +1537,7 @@
     },
     {
       "source_path": "articles/cosmos-db/sql-api-sql-query.md",
-      "redirect_url": "/azure/cosmos-db/how-to-sql-query",
+      "redirect_url": "/azure/cosmos-db/sql-query-getting-started",
       "redirect_document_id": false
     },
     {
@@ -1545,6 +1550,31 @@
       "redirect_url": "/azure/cosmos-db/high-availability",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/search/search-fiddler.md",
+      "redirect_url": "/azure/search/search-get-started-postman",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/search/search-create-index-rest-api.md",
+      "redirect_url": "/azure/search/search-get-started-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/search/search-create-index-dotnet.md",
+      "redirect_url": "/azure/search/search-get-started-dotnet",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/search/search-import-data-dotnet.md",
+      "redirect_url": "/azure/search/search-get-started-dotnet",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/search/search-query-dotnet.md",
+      "redirect_url": "/azure/search/search-get-started-dotnet",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/search/search-autosuggest-example.md",
       "redirect_url": "/azure/search/search-autocomplete-tutorial",
@@ -4655,11 +4685,21 @@
       "redirect_url": "/azure/app-service-mobile",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/application-gateway/application-gateway-create-gateway-arm-template.md",
+      "redirect_url": "/azure/application-gateway/create-vmss-template",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-gateway/application-gateway-webapplicationfirewall-overview.md",
       "redirect_url": "/azure/application-gateway/application-gateway-web-application-firewall-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/application-gateway/application-gateway-create-multisite-portal.md",
+      "redirect_url": "/azure/application-gateway/create-multiple-sites-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-gateway/application-gateway-introduction.md",
       "redirect_url": "/azure/application-gateway/overview",
@@ -11207,7 +11247,7 @@
     },
     {
       "source_path": "articles/hdinsight/hdinsight-hadoop-r-scripts.md",
-      "redirect_url": "/azure/hdinsight/r-server/r-server-get-started",
+      "redirect_url": "/azure/hdinsight/r-server/r-server-overview",
       "redirect_document_id": false
     },
     {
@@ -11272,7 +11312,7 @@
     },
     {
       "source_path": "articles/hdinsight/hdinsight-hadoop-r-scripts-linux.md",
-      "redirect_url": "/azure/hdinsight/hdinsight-hadoop-r-server-get-started",
+      "redirect_url": "/azure/hdinsight/hdinsight-hadoop-r-server-overview",
       "redirect_document_id": false
     },
     {
@@ -12152,7 +12192,7 @@
     },
     {
       "source_path": "articles/cosmos-db/documentdb-sql-query-reference.md",
-      "redirect_url": "/azure/cosmos-db/sql-api-sql-query-reference",
+      "redirect_url": "/azure/cosmos-db/sql-query-getting-started",
       "redirect_document_id": false
     },
     {
@@ -15360,6 +15400,11 @@
       "redirect_url": "/azure/aks/networking-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/stream-analytics/stream-analytics-common-troubleshooting-issues.md",
+      "redirect_url": "/azure/stream-analytics/stream-analytics-troubleshoot-input",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/stream-analytics/vs-code-how-to.md",
       "redirect_url": "/azure/stream-analytics/vscode-explore-jobs",
@@ -22464,6 +22509,21 @@
       "redirect_url": "/azure/vs-azure-tools-storage-explorer-relnotes",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cosmos-db/how-to-sql-query.md",
+      "redirect_url": "/azure/cosmos-db/sql-query-getting-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/sql-api-query-getting-started.md",
+      "redirect_url": "/azure/cosmos-db/sql-query-getting-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cosmos-db/sql-query-reference.md",
+      "redirect_url": "/azure/cosmos-db/sql-query-getting-started",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/secure-email-introduction.md",
       "redirect_url": "https://docs.microsoft.com/microsoft-365-enterprise/microsoft-365-policies-configurations",
@@ -25674,6 +25734,11 @@
       "redirect_url": "https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/hdinsight/storm/apache-storm-tutorial-get-started-linux.md",
+      "redirect_url": "/azure/hdinsight/storm/apache-storm-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/hdinsight/hdinsight-apache-spark-resource-manager.md",
       "redirect_url": "/azure/hdinsight/spark/apache-spark-resource-manager",
@@ -25696,8 +25761,8 @@
     },
     {
       "source_path": "articles/hdinsight/hdinsight-apache-storm-tutorial-get-started-linux.md",
-      "redirect_url": "/azure/hdinsight/storm/apache-storm-tutorial-get-started-linux",
-      "redirect_document_id": true
+      "redirect_url": "/azure/hdinsight/storm/apache-storm-overview",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/hdinsight/hdinsight-connect-excel-hive-odbc-driver.md",
@@ -25811,8 +25876,8 @@
     },
     {
       "source_path": "articles/hdinsight/hdinsight-hadoop-r-server-get-started.md",
-      "redirect_url": "/azure/hdinsight/r-server/r-server-get-started",
-      "redirect_document_id": true
+      "redirect_url": "/azure/hdinsight/r-server/r-server-overview",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/hdinsight/hdinsight-hadoop-r-server-install-r-studio.md",
@@ -25822,7 +25887,7 @@
     {
       "source_path": "articles/hdinsight/hdinsight-hadoop-r-server-overview.md",
       "redirect_url": "/azure/hdinsight/r-server/r-server-overview",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/hdinsight/hdinsight-hadoop-r-server-storage.md",
@@ -26141,7 +26206,12 @@
     },
     {
       "source_path": "articles/hdinsight/r-server/r-server-install-r-studio.md",
-      "redirect_url": "/azure/hdinsight/r-server/r-server-get-started",
+      "redirect_url": "/azure/hdinsight/r-server/r-server-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/hdinsight/r-server/r-server-get-started.md",
+      "redirect_url": "/azure/hdinsight/r-server/r-server-overview",
       "redirect_document_id": false
     },
     {
@@ -27128,6 +27198,11 @@
       "source_path": "articles/backup/backup-azure-dpm-introduction-classic.md",
       "redirect_url": "/azure/backup/backup-azure-dpm-introduction",
       "redirect_document_id": false
+    },
+	{
+      "source_path": "articles/backup/backup-azure-monitor-vms.md",
+      "redirect_url": "/azure/backup/backup-azure-monitoring-built-in-monitor",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/backup/backup-azure-manage-vms-classic.md",
@@ -30293,7 +30368,17 @@
       "source_path": "articles/networking/index.md",
       "redirect_url": "/azure/networking/networking-overview",
       "redirect_document_id": false
-    },
+    },    
+    {
+      "source_path": "articles/notification-hubs/configure-android-device-messaging.md",
+      "redirect_url": "/azure//notification-hubs/configure-google-firebase-cloud-messaging",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path": "articles/notification-hubs/notification-hubs-kindle-amazon-adm-push-notification.md",
+      "redirect_url": "/azure//notification-hubs/notification-hubs-android-push-notification-google-fcm-get-started",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/security/blueprints/index.md",
       "redirect_url": "/azure/security/index",
@@ -35048,6 +35133,11 @@
       "redirect_url": "/azure/azure-monitor/log-query/portals",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/azure-monitor/log-query/portals.md",
+      "redirect_url": "/azure/azure-monitor/log-query/log-query-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/log-analytics/log-analytics-log-search-takeaction.md",
       "redirect_url": "/azure/azure-monitor/log-query/take-action",
@@ -36378,6 +36468,11 @@
       "redirect_url": "/azure/azure-monitor/platform/activity-log-collect",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-monitor/learn/tutorial-viewdata.md",
+      "redirect_url": "/azure/azure-monitor/log-query/get-started-portal",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/machine-learning/service/how-to-automated-ml.md",
       "redirect_url": "/azure/machine-learning/service/concept-automated-ml",
@@ -36578,6 +36673,17 @@
       "redirect_url": "https://docs.microsoft.com/python/api/overview/azure/dataprep/intro?view=azure-dataprep-py",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/machine-learning/service/how-to-create-dataset-snapshots.md",
+      "redirect_url": "https://docs.microsoft.com/python/api/azureml-core/azureml.data.dataset_snapshot.datasetsnapshot?view=azure-ml-py",
+      "redirect_document_id": false
+    },
+
+    {
+      "source_path": "articles/machine-learning/service/how-to-manage-dataset-definitions.md",
+      "redirect_url": "https://docs.microsoft.com/python/api/azureml-core/azureml.core.dataset?view=azure-ml-py",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/governance/policy/samples/allowed-app-gate-sku.md",
       "redirect_url": "/azure/governance/policy/samples/allowed-app-gateway-sku",
@@ -37282,6 +37388,10 @@
       "source_path": "articles/azure-monitor/platform/collect-activity-logs-subscriptions.md",
       "redirect_url": "/azure/azure-monitor/platform/activity-log-collect-tenants",
       "redirect_document_id": false
+    },    {
+      "source_path": "articles/azure-monitor/app/analytics.md",
+      "redirect_url": "/azure/azure-monitor/log-query/portals",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/azure-monitor/platform/oms-portal-faq.md",
@@ -37465,7 +37575,12 @@
     },
     {
       "source_path": "articles/hdinsight/hdinsight-analyze-flight-delay-data.md",
-      "redirect_url": "/azure/hdinsight/hdinsight-analyze-flight-delay-data-linux",
+      "redirect_url": "/azure/hdinsight/interactive-query/interactive-query-tutorial-analyze-flight-data",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/hdinsight/hdinsight-analyze-flight-delay-data-linux.md",
+      "redirect_url": "/azure/hdinsight/interactive-query/interactive-query-tutorial-analyze-flight-data",
       "redirect_document_id": false
     },
     {
@@ -39917,6 +40032,16 @@
       "source_path": "articles/backup/backup-azure-upgrade-backup-to-recovery-services.md",
       "redirect_url": "/azure/backup/backup-create-rs-vault",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-container-instance.md",
+      "redirect_url": "/azure/cognitive-services/text-analytics/how-tos/use-language-detection-on-aks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/data-lake-storage-use-hdi-cluster.md",
+      "redirect_url": "/azure/hdinsight/hdinsight-hadoop-use-data-lake-storage-gen2",
+      "redirect_document_id": false
     }
   ]
 }

README.md

@@ -26,10 +26,9 @@ Follow the instructions provided in the [Install content authoring tools](https:
 
 ## License
 
-Please refer to [LICENSE](.github/LICENSE), [LICENSE-CODE](.github/LICENSE-CODE) and [ThirdPartyNotices](.github/ThirdPartyNotices.md) for all Licensing information.
+Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
 
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
-

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

@@ -98,6 +98,10 @@ By now, you have configured your policy so that Azure AD B2C knows how to commun
 2. Enable **Overwrite the policy if it exists**, and then browse to and select the *TrustFrameworkExtensions.xml* file.
 3. Click **Upload**.
 
+> [!NOTE]
+> The Visual Studio code B2C extension uses "socialIdpUserId." A social policy is also required for ADFS.
+>
+
 ## Register the claims provider
 
 At this point, the identity provider has been set up, but it’s not available in any of the sign-up or sign-in screens. To make it available, you create a duplicate of an existing template user journey, and then modify it so that it also has the ADFS identity provider.