Merge branch 'master' into patch-19

Author: nikitapitliya

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["master" "release-.*"]
- :allowed-filename-matches ["articles/" "includes/"]}
+ :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml))" "includes/"]}

.github/workflows/stale.yml

@@ -2,7 +2,7 @@ name: Mark stale pull requests
 
 on:
   schedule:
-  - cron: "0 */4 * * *"
+  - cron: "0 */6 * * *"
 
 jobs:
   stale:
@@ -20,7 +20,7 @@ jobs:
         exempt-pr-labels: keep-open
         operations-per-run: 1200
         ascending: false
-        # start-date: '2021-02-16'
+        # start-date: '2021-03-19'
         stale-pr-message: >
           This pull request has been inactive for at least 14 days.
           If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.publish.config.json

@@ -324,13 +324,13 @@
     {
       "path_to_root": "azure-iot-sdk-node",
       "url": "https://github.com/Azure/azure-iot-sdk-node",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "iot-samples-c",
       "url": "https://github.com/Azure/azure-iot-sdk-c",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -806,6 +806,7 @@
   "redirection_files": [
     ".openpublishing.redirection.json",
     ".openpublishing.redirection.active-directory.json",
+    ".openpublishing.redirection.azure-sql.json",
     ".openpublishing.redirection.data-factory.json",
     ".openpublishing.redirection.defender-for-cloud.json",
     ".openpublishing.redirection.defender-for-iot.json",
@@ -814,6 +815,7 @@
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.media-services.json",
     ".openpublishing.redirection.security-benchmark.json",
+    ".openpublishing.redirection.sql-database.json",
     ".openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",
     ".openpublishing.redirection.azure-percept.json",

.openpublishing.redirection.active-directory.json

@@ -5,6 +5,11 @@
           "redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
           "redirect_document_id": false
         },
+        {
+           "source_path_from_root": "/articles/active-directory/authentication/how-to-authentication-kerberos.md",
+           "redirect_url": "/azure/virtual-desktop/create-profile-container-azure-ad",
+           "redirect_document_id": false
+        },
         {
           "source_path_from_root": "/articles/active-directory/manage-apps/application-management-fundamentals.md",
           "redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -4395,6 +4400,21 @@
             "redirect_url": "/azure/active-directory/cloud-sync/tutorial-pilot-aadc-aadccp",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/governance/what-is-app-provisioning.md",
+            "redirect_url": "/azure/active-directory/app-provisioning/user-provisioning",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/articles/active-directory/governance/what-is-hr-driven-provisioning.md",
+            "redirect_url": "azure/active-directory/app-provisioning/what-is-hr-driven-provisioning",
+            "redirect_document_id": false
+        },
+{
+            "source_path_from_root": "/articles/active-directory/governance/what-is-inter-directory-provisioning.md",
+            "redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
             "redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -10594,8 +10614,29 @@
             "source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-rest.md",
             "redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-rest",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/verifiable-credentials/enable-your-tenant-verifiable-credentials.md",
+            "redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant",
+            "redirect_document_id": false
+        }
+        ,
+        {
+            "source_path": "articles/active-directory/verifiable-credentials/issue-verify-verifiable-credentials-your-tenant.md",
+            "redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-issuer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/verifiable-credentials/get-started-verifiable-credentials.md",
+            "redirect_url": "/azure/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/active-directory/manage-apps/application-types.md",
+            "redirect_url": "/azure/active-directory/manage-apps/application-list",
+            "redirect_document_id": false
         }
-   
+ 
 
     ]
 }

.openpublishing.redirection.azure-sql.json

@@ -0,0 +1,184 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
+            "redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes-whats-new",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-manually-configure-prerequisites-tutorial.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-manually-configure-prerequisites-tutorial-single-subnet",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-manually-configure-tutorial.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-manually-configure-tutorial-single-subnet",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/advanced-data-security.md",
+            "redirect_url": "/azure/azure-sql/database/azure-defender-for-sql",
+            "redirect_document_id": false
+        },            
+        {
+            "source_path_from_root": "/articles/azure-sql/database/connect-query-r.md",
+            "redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/service-tiers-prs.md",
+            "redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/sql-data-sync-monitor-sync.md",
+            "redirect_url": "/azure/azure-sql/database/monitor-tune-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/policy-samples.md",
+            "redirect_url": "/azure/azure-sql/database/policy-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/security-controls.md",
+            "redirect_url": "/azure/azure-sql/database/security-baseline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/machine-learning-services-differences.md",
+            "redirect_url": "/azure/azure-sql/managed-instance/machine-learning-services-differences",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/machine-learning-services-overview.md",
+            "redirect_url": "/azure/azure-sql/managed-instance/machine-learning-services-overview",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/managed-instance/migrate-to-instance-from-sql-server.md",
+            "redirect_url": "/azure/azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-guide",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/managed-instance/scripts/create-powershell-azure-resource-manager-template.md",
+            "redirect_url": "/azure/azure-sql/managed-instance/create-template-quickstart",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/linux/index.yml",
+            "redirect_url": "/azure/azure-sql/virtual-machines/linux/sql-server-on-linux-vm-what-is-iaas-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-az-cli-configure.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-az-commandline-configure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/availability-group-azure-marketplace-template-configure.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-quickstart-template-configure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/hadr-vnn-azure-load-balancer-configure.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/availability-group-vnn-azure-load-balancer-configure",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/hadr-distributed-network-name-dnn-configure.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/failover-cluster-instance-distributed-network-name-dnn-configure",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vm-resource-provider-automatic-registration.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-automatic-registration-all-vms",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vm-resource-provider-register.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-manually-register-single-vm",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vm-resource-provider-bulk-register.md",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-agent-extension-manually-register-vms-bulk",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/index.yml",
+            "redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/virtual-machines/windows/sql-vulnerability-assessment-enable.md",
+            "redirect_url": "/azure/security-center/defender-for-sql-on-machines-vulnerability-assessment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/machine-learning-services-add-r-packages.md",
+            "redirect_url": "/sql/machine-learning/package-management/install-additional-r-packages-on-sql-server?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/r-script-create-quickstart.md",
+            "redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/machine-learning-services-data-issues.md",
+            "redirect_url": "/sql/machine-learning/tutorials/quickstart-r-data-types-and-objects?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/machine-learning-services-functions.md",
+            "redirect_url": "/sql/machine-learning/tutorials/quickstart-r-functions?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/r-train-score-model-create-quickstart.md",
+            "redirect_url": "/sql/machine-learning/tutorials/quickstart-r-train-score-model?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/clustering-model-build-tutorial.md",
+            "redirect_url": "/sql/machine-learning/tutorials/r-clustering-model-build?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/clustering-model-deploy-tutorial.md",
+            "redirect_url": "/sql/machine-learning/tutorials/r-clustering-model-deploy?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/clustering-model-prepare-data-tutorial.md",
+            "redirect_url": "/sql/machine-learning/tutorials/r-clustering-model-introduction?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/predictive-model-deploy-tutorial.md",
+            "redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-deploy?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/predictive-model-prepare-data-tutorial.md",
+            "redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-introduction?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/predictive-model-build-compare-tutorial.md",
+            "redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-train?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
+            "redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
+            "redirect_document_id": true
+        }                                                                                                                        
+    ]
+}

.openpublishing.redirection.defender-for-cloud.json

@@ -5,6 +5,11 @@
             "redirect_url": "/azure/defender-for-cloud/release-notes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/security-center/upcoming-changes.md",
+            "redirect_url": "/azure/defender-for-cloud/upcoming-changes",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/release-notes-archive.md",
             "redirect_url": "/azure/defender-for-cloud/release-notes-archive",
@@ -15,6 +20,11 @@
             "redirect_url": "/azure/defender-for-cloud/defender-for-cloud-introduction",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/security-center/deploy-vulnerability-assessment-byol-vm.md",
+            "redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-byol-vm",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/azure-defender.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-cloud-introduction",
@@ -644,6 +654,16 @@
             "source_path_from_root": "/articles/security-center/workload-protections-dashboard.md",
             "redirect_url": "/azure/defender-for-cloud/workload-protections-dashboard",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/container-security.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-containers-introduction",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-kubernetes-azure-arc.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-containers-enable?pivots=defender-for-container-arc#protect-arc-enabled-kubernetes-clusters",
+            "redirect_document_id": true
         }
       ]
 }