Merge branch 'main' into 2202-02-22-in-operator-changes

Author: tapanm-MSFT

.acrolinx-config.edn

@@ -1,4 +1,4 @@
-{:allowed-branchname-matches ["^master$"]
+{:allowed-branchname-matches ["^main$"]
  :allowed-filename-matches ["powerapps-docs"]
  :guidance-profile "dc59e3ef-24fd-46d7-9156-0491aaae6bef" ;; Profile ID for "BAG-specific" 
  :use-skip-label true

.openpublishing.publish.config.json

@@ -71,13 +71,13 @@
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "_themes.pdf",
       "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -88,14 +88,23 @@
         "master": "master",
         "live": "live"
       }
+    },
+    {
+      "path_to_root": "PowerApps-Samples",
+      "url": "https://github.com/microsoft/PowerApps-Samples",
+      "branch": "master",
+      "branch_mapping": {
+        "master": "master",
+        "live": "master"
+      }
     }
   ],
   "branch_target_mapping": {
     "live": [
       "Publish",
       "PDF"
     ],
-    "master": [
+    "main": [
       "Publish",
       "PDF"
     ],

.openpublishing.redirection.json

@@ -1,5 +1,20 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/maker/model-driven-apps/optimize-form-performance.md",
+      "redirect_url": "design-performant-forms",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/maker/model-driven-apps/page-data-connectors.md",
+      "redirect_url": "../canvas-apps/connections-list",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/maker/portals/web-api-perform-operations.md",
+      "redirect_url": "write-update-delete-operations",
+      "redirect_document_id": "false"
+    },
     {
       "source_path": "powerapps-docs/teams/extend-milestones-send%20notification.md",
       "redirect_url": "extend-milestones-send-notification",
@@ -377,7 +392,7 @@
     },
     {
       "source_path": "powerapps-docs/maker/canvas-apps/working-with-environments.md",
-      "redirect_url": "/power-platform/admin/working-with-environments",
+      "redirect_url": "/powerapps/maker/canvas-apps/intro-maker-portal",
       "redirect_document_id": "false"
     },
     {
@@ -497,7 +512,7 @@
     },
     {
       "source_path": "powerapps-docs/administrator/environments-administration.md",
-      "redirect_url": "/power-platform/admin/environments-administration",
+      "redirect_url": "/power-platform/admin/create-environment",
       "redirect_document_id": "false"
     },
     {
@@ -697,7 +712,7 @@
     },
     {
       "source_path": "powerapps-docs/environments-administration.md",
-      "redirect_url": "/powerapps/administrator/environments-administration",
+      "redirect_url": "/power-platform/admin/create-environment",
       "redirect_document_id": "false"
     },
     {
@@ -1797,7 +1812,7 @@
     },
     {
       "source_path": "powerapps-docs/working-with-environments.md",
-      "redirect_url": "/powerapps/maker/canvas-apps/working-with-environments",
+      "redirect_url": "/powerapps/maker/canvas-apps/intro-maker-portal",
       "redirect_document_id": "false"
     },
     {
@@ -6354,6 +6369,31 @@
       "source_path": "powerapps-docs/learning-catalog/learning-catalog-bdm.md",
       "redirect_url": "powerapps-docs/learning-catalog/bdm.md",
       "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/data-platform/best-practices/index.md",
+      "redirect_url": "/powerapps/developer/data-platform/best-practices/",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/component-framework/reference/linking/clear.md",
+      "redirect_url": "/powerapps/developer/component-framework/reference/linking",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/component-framework/reference/linking/includes/clear-description.md",
+      "redirect_url": "/powerapps/developer/component-framework/reference/linking",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/component-framework/reference/linking/includes/removeLinkedEntity-description.md",
+      "redirect_url": "/powerapps/developer/component-framework/reference/linking",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/component-framework/reference/linking/removeLinkedEntity.md",
+      "redirect_url": "/powerapps/developer/component-framework/reference/linking",
+      "redirect_document_id": "false"
     }
   ]
 }

CODEOWNERS

@@ -3,6 +3,11 @@
 
 /powerapps-docs/                                    @KumarVivek
 /powerapps-docs/administrator/                      @jimholtz @KumarVivek
-/powerapps-docs/developer/                          @PHecke @Nkrb @KumarVivek
-/powerapps-docs/maker/                              @Mattp123 @tapanm-msft @KumarVivek
+/powerapps-docs/developer/                          @PHecke @KumarVivek
+/powerapps-docs/maker/canvas-apps                   @tapanm-msft @KumarVivek
+/powerapps-docs/maker/data-platform                 @Mattp123 @KumarVivek
+/powerapps-docs/maker/model-driven-apps             @Mattp123 @KumarVivek
+/powerapps-docs/maker/common                        @Mattp123 @tapanm-msft @KumarVivek
+/powerapps-docs/maker/portals                       @nickdoelman @KumarVivek
 /powerapps-docs/user/                               @mduelae @KumarVivek
+/powerapps-docs/teams/                              @tapanm-msft @KumarVivek

app-selector2.png

@@ -2,7 +2,7 @@
 title: Create chatbots from Power Apps | Microsoft Docs
 description: Provides information about how to create chatbots from Power Apps.
 author: iaanw
-ms.service: powerapps
+
 ms.topic: conceptual
 ms.custom: 
 ms.date: 06/26/2020

clear_filter.png

@@ -7,7 +7,7 @@ ms.author: nabuthuk
 author: Nkrb
 manager: kvivek
 ms.date: 04/01/2021
-ms.service: "powerapps"
+
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.topic: "article"

embed-power-bi-tile-features.png

@@ -2,7 +2,7 @@
 title: "Code components application lifecycle management | MicrosoftDocs"
 description: "Learn about the considerations and strategies for working with specific aspects of ALM from the perspective of code components in Microsoft Dataverse."
 ms.date: 09/08/2021
-ms.service: "powerapps"
+
 ms.topic: "article"
 ms.assetid: 18e88d702-3349-4022-a7d8-a9adf52cd34f
 ms.subservice: pcf