Merge remote-tracking branch 'origin/master'

Author: konjac

.acrolinx-config.edn

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

.github/workflows/stale.yml

@@ -14,13 +14,13 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-pr-stale: 14
-        days-before-pr-close: 9999
+        days-before-pr-close: 90
         stale-pr-label: inactive
         close-pr-label: auto-close
         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

@@ -75,6 +75,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure_cli_scripts",
+      "url": "https://github.com/Azure-Samples/azure-cli-samples",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "powershell_scripts",
       "url": "https://github.com/Azure/azure-docs-powershell-samples",
@@ -806,6 +812,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,9 +821,12 @@
     ".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-monitor.json",
     ".openpublishing.redirection.azure-percept.json",
+    ".openpublishing.redirection.azure-productivity.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
     "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",   
     "articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.active-directory.json

@@ -4275,17 +4275,17 @@
             "redirect_url": "/azure/active-directory/governance/self-access-review",
             "redirect_document_id": false
         },
-{
+        {
             "source_path_from_root": "/azure/active-directory/governance/entitlement-management-access-reviews-self-review.md",
             "redirect_url": "/azure/active-directory/governance/self-access-review",
             "redirect_document_id": false
         },
-{
+        {
             "source_path_from_root": "/azure/active-directory/governance/manage-guest-access-with-access-reviews.md",
             "redirect_url": "/azure/active-directory/governance/manage-access-review",
             "redirect_document_id": false
         },
-{
+        {
             "source_path_from_root": "/azure/active-directory/governance/manage-user-access-with-access-reviews.md",
             "redirect_url": "/azure/active-directory/governance/manage-access-review",
             "redirect_document_id": false
@@ -4400,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",
@@ -7152,14 +7167,24 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/users-groups-roles/roles-admin-units-add-manage-groups.md",
-            "redirect_url": "/azure/active-directory/roles/admin-units-add-manage-groups",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/roles/admin-units-members-add",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/roles/admin-units-add-manage-groups.md",
+            "redirect_url": "/azure/active-directory/roles/admin-units-members-add",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/users-groups-roles/roles-admin-units-add-manage-users.md",
-            "redirect_url": "/azure/active-directory/roles/admin-units-add-manage-users",
+            "redirect_url": "/azure/active-directory/roles/admin-units-members-add",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/active-directory/roles/admin-units-add-manage-users.md",
+            "redirect_url": "/azure/active-directory/roles/admin-units-members-add",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/users-groups-roles/roles-admin-units-assign-roles.md",
             "redirect_url": "/azure/active-directory/roles/admin-units-assign-roles",
@@ -10599,8 +10624,33 @@
             "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
+        },
+        {
+            "source_path": "articles/active-directory/reports-monitoring/reference-basic-info-identifiers.md",
+            "redirect_url": "/azure/active-directory/reports-monitoring/reference-basic-info-sign-in-logs",
+            "redirect_document_id": false
         }
-   
 
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -0,0 +1,14 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
+            "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
+            "redirect_url": "/azure/azure-monitor/app/performance-counters",
+            "redirect_document_id": true
+        }
+    ]
+}

.openpublishing.redirection.azure-productivity.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
+            "redirect_url": "/azure/lab-services/get-started-manage-labs",
+            "redirect_document_id": false
+        }
+    ]
+}