Merge branch 'main' into u/rarattay/geoJSONImageUpdate

Author: iaanw

.gitignore

@@ -7,6 +7,7 @@ _repo.*/
 
 .openpublishing.buildcore.ps1
 settings.json
+.DS_Store
 
 # Folder config file
 [Dd]esktop.ini
@@ -18,3 +19,5 @@ powerapps-docs/.vs/ProjectSettings.json
 powerapps-docs/.vs/slnx.sqlite
 powerapps-docs/.vs/VSWorkspaceState.json
 /.vs/slnx.sqlite-journal
+powerapps-docs/teams/media/how-to-architecture/Thumbs.db
+powerapps-docs/teams/media/milestones-broad-distribution/Thumbs.db

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/developer/component-framework/reference/lookupoptions.md",
+      "redirect_url": "utility/lookupobjects",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/maker/dev-community-plan.md",
+      "redirect_url": "developer-plan",
+      "redirect_document_id": "false"
+    },
     {
       "source_path": "powerapps-docs/user/powerapps-mobile-troubleshoot.md",
       "redirect_url": "../mobile/powerapps-mobile-troubleshoot",
@@ -6269,6 +6279,56 @@
       "source_path": "powerapps-docs/sample-apps/return-to-workplace/app-for-employee.md",
       "redirect_url": "/dynamics365/industry/return-to-workplace/app-for-employee",
       "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/developer/data-platform/developer-resources-page.md",
+      "redirect_url": "/powerapps/developer/data-platform/view-download-developer-resources",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/maker/data-platform/business-events.md",
+      "redirect_url": "/powerapps/developer/data-platform/business-events",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/get-started.md",
+      "redirect_url": "powerapps-docs/learning-catalog/learning-catalog.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-administrator.md",
+      "redirect_url": "powerapps-docs/learning-catalog/administrator.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-app-maker.md",
+      "redirect_url": "powerapps-docs/learning-catalog/app-maker.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-business-user.md",
+      "redirect_url": "powerapps-docs/learning-catalog/app-maker.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-developer.md",
+      "redirect_url": "powerapps-docs/learning-catalog/developer.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-functional-consultant.md",
+      "redirect_url": "powerapps-docs/learning-catalog/functional-consultant.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-solution-architect.md",
+      "redirect_url": "powerapps-docs/learning-catalog/solution-architect.md",
+      "redirect_document_id": "false"
+    },
+    {
+      "source_path": "powerapps-docs/learning-catalog/learning-catalog-bdm.md",
+      "redirect_url": "powerapps-docs/learning-catalog/bdm.md",
+      "redirect_document_id": "false"
     }
   ]
 }

powerapps-docs/chatbots.md

@@ -1,27 +1,29 @@
 ---
 title: Create chatbots from Power Apps | Microsoft Docs
-description: Provides information about how you can use AI Builder in Power Apps.
+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
 ms.author: iawilt
 ms.reviewer: mvakoc
+contributors:
+  - iaanw
 ---
 # Create chatbots from Power Apps
 
 Power Virtual Agents allows you to quickly create and maintain intelligent chatbots using a no-code interface. App makers can create and manage their chatbots directly from [Power Apps](https://make.powerapps.com). 
 
-![Chatbots from Power Apps](media/chatbots.png "Chatbots from Power Apps")
+![Chatbots from Power Apps.](media/chatbots.png "Chatbots from Power Apps")
 
 You can create and manage your chatbots using the **Chatbots** option in the left navigation pane.
 
-- To create a chatbot, select **Chatbots**, then **Create**, and then select **New chatbot**. This will take you directly to the Power Virtual Agents portal where you can create your chatbot. For more information, see [Create a bot in Power Virtual Agents](https://docs.microsoft.com/power-virtual-agents/authoring-first-bot)
+- To create a chatbot, select **Chatbots**, then **Create**, and then select **New chatbot**. This will take you directly to the Power Virtual Agents portal where you can create your chatbot. For more information, see [Create a bot in Power Virtual Agents](/power-virtual-agents/authoring-first-bot)
 
 - After you have chatbots in your environment, you'll be able to view them by selecting **Chatbots** and then **List**. You can navigate directly to the Power Virtual Agents portal to update your bot or view analytics.
 
-More information: [Power Virtual Agents docs](https://docs.microsoft.com/power-virtual-agents)
+More information: [Power Virtual Agents docs](/power-virtual-agents)
 
 
 [!INCLUDE[footer-include](includes/footer-banner.md)]

powerapps-docs/developer/component-framework/add-custom-controls-to-a-field-or-entity.md

@@ -2,6 +2,7 @@
 title: Add code components to a column or table in Microsoft Dataverse | Microsoft Docs
 description: Learn how to add code components to a column or table.
 keywords:
+ms.subservice: pcf
 ms.author: nabuthuk
 author: Nkrb
 manager: kvivek
@@ -19,7 +20,7 @@ Code components let you transform columns that traditionally contain text into v
 [!INCLUDE[cc-terminology](../data-platform/includes/cc-terminology.md)]
 
    > [!div class="mx-imgBorder"] 
-   > ![Custom slider control](../../maker/model-driven-apps/media/slider-control.PNG "Custom slider control ")
+   > ![Custom slider control.](../../maker/model-driven-apps/media/slider-control.PNG "Custom slider control ")
 
 ## Add a code component to a column
 
@@ -36,7 +37,7 @@ Following the steps below will change the default label and text box column of t
 5. On the Add Control page, select the component that you want, such as the **Linear Slider** component, and then select **Add**.
 
    > [!div class="mx-imgBorder"] 
-   > ![Add linear slider control](../../maker/model-driven-apps/media/add-slider.PNG "Add linear slider control")
+   > ![Add linear slider control.](../../maker/model-driven-apps/media/add-slider.PNG "Add linear slider control")
 
 6. Choose the client where you want the component to appear.
 
@@ -47,12 +48,12 @@ Following the steps below will change the default label and text box column of t
    - **Tablet**. To make the code component available on tablet devices running Dynamics 365 for tablets, select the Tablet option next to the component.
 
    > [!div class="mx-imgBorder"] 
-   > ![Choose the client apps to view the custom control](../../maker/model-driven-apps/media/choose-client.png "Choose the client apps to view the custom control") 
+   > ![Choose the client apps to view the custom control.](../../maker/model-driven-apps/media/choose-client.png "Choose the client apps to view the custom control") 
 
 7. Select the pencil icon next to **Min**, **Max**, and **Step**, set the property option, and then select **OK**.  
 
    > [!div class="mx-imgBorder"] 
-   > ![Add custom control properties](../../maker/model-driven-apps/media/ccf-add-properties.png "Add custom control properties")
+   > ![Add custom control properties.](../../maker/model-driven-apps/media/ccf-add-properties.png "Add custom control properties")
 
    - **Min**. Set the minimum accepted value. You can bind a static value that you enter or bind the value to an existing column. In this example **Bind to static value** is **Currency** and the minimum value that can be entered is *zero*.  
 
@@ -74,7 +75,7 @@ Following the steps below will change the default label and text box column of t
 
 ## Add code component to a table
 
-To add a code component like data-set component or simple table component to a grid or view, follow the steps below:
+To add a code component like dataset component or simple table component to a grid or view, follow the steps below:
 
   - Navigate to **Settings > Customizations** and click on **Customize the System**.
   - Click on the arrow next to **Entities** tab a select the table you want to add the code component. 
@@ -88,7 +89,7 @@ To add a code component like data-set component or simple table component to a g
  Open a record that includes the column with the code component, such as the Opportunity form from the previous example, and view how the column is changed. The column is now rendered as a slider component instead of the text column.  
 
 > [!div class="mx-imgBorder"] 
-> ![Slider control rendered on form](../../maker/model-driven-apps/media/slider-control.PNG "Slider control rendered on form")  
+> ![Slider control rendered on form.](../../maker/model-driven-apps/media/slider-control.PNG "Slider control rendered on form")  
 
 ### See also