Merge branch 'live' into UmeshLohote-GEP-patch-1

Author: tapanm-MSFT

.openpublishing.redirection.json

@@ -1640,6 +1640,11 @@
       "source_path": "powerapps-docs/developer/common-data-service/use-web-services.md",
       "redirect_url": "https://docs.microsoft.com/powerapps/developer/common-data-service/work-with-data-cds",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "powerapps-docs/maker/maker/canvas-apps/webinars-listing.md",
+      "redirect_url": "https://powerusers.microsoft.com/t5/Samples-Learning-and-Videos/ct-p/PA_Comm_Galleries",
+      "redirect_document_id": true
     }
   ]
 }

powerapps-docs/developer/component-framework/faq.md

@@ -59,7 +59,7 @@ This is not supported natively by the framework. You can use one of many third-p
 
 Currently, font resources (files with a .ttf file extension) are not supported by the framework.
 
-### Can I use img resource for canvas apps?
+### Can I use img resource property in canvas apps?
 
 Currently, [img](manifest-schema-reference/img.md) resources are not supported in canvas apps.
 

powerapps-docs/developer/component-framework/reference/webapi/retrieverecord.md

@@ -56,7 +56,7 @@ Model-driven apps
 </ul>
 <p>You specify the query options starting with <code>?</code>. You can also specify multiple query options by using <code>&amp;</code> to separate the query options. For example:</p>
 <code>?$select=name&amp;$expand=primarycontactid($select=contactid,fullname)</code>
-<p>See examples later in this topic to see how you can define the <code>options</code> parameter for various retrieve scenarios.</td>
+</td>
 </tr>
 <tr>
 <td>successCallback</td>

powerapps-docs/developer/component-framework/use-sample-components.md

@@ -19,20 +19,23 @@ All the sample components listed under this section are available to download fr
 The individual sample component topics under this section provide you an overview of the sample component, it's visual appearance, and the manifest, code, and resources for the sample component.
 
 ## Before you can try the sample components
+
 To try the sample components, you must first:
+
 - [Download](https://go.microsoft.com/fwlink/?linkid=2088525) the sample components so that you have a local copy.
 - Install [Power Apps CLI](https://aka.ms/PowerAppsCLI).
 
 ## Try the sample components
+
 Follow the steps below to import and try the sample components in your model-driven or canvas app:
 
 1. Navigate to the folder on your computer where you have downloaded the sample components, and extract the .zip file.  
-1. Open Developer Command Prompt for Visual Studio 2017 and navigate to the sample component folder in the extracted folder that you want to see it in runtime. For example, navigate to the \<extracted_folder>/TS_IncrementComponent folder.
+1. Open Developer Command Prompt for Visual Studio 2017 and navigate to the sample component folder in the extracted folder that you want to see it in runtime. For example, navigate to the `/extracted_folder/TS_IncrementComponent` folder.
 1. Run the following command to get all the required dependencies:
     ```CLI
     npm install
     ```
-1. Create a new folder using the command `mkdir <folder name>` inside the sample component folder and navigate into the folder using the command `cd <folder name>`. 
+1. Create a new folder using the command `mkdir <folder name>` inside the sample component folder that has the `pcfproj` file and navigate into the folder using the command `cd <folder name>`. 
 1. Create a new solution project inside the folder using the following command:
     ```CLI
     pac solution init --publisher-name <Name of the publisher> --publisher-prefix <Publisher prefix>

powerapps-docs/maker/TOC.yml

@@ -1674,9 +1674,7 @@
     - name: Portal for healthcare worker
       href: ../sample-apps/regional-emergency-response/portals-user.md
 - name: Learn from others
-  items:
-  - name: Webinars
-    href: ./canvas-apps/webinars-listing.md
+  items:  
   - name: Blog
     href: https://powerapps.microsoft.com/blog/
   - name: Forums

powerapps-docs/maker/canvas-apps/application-insights.md

@@ -4,7 +4,7 @@ description: Do one or more tasks in canvas app when a component-based action oc
 author: yifwang
 ms.service: powerapps
 ms.topic: article
-ms.date: 02/20/2020
+ms.date: 04/24/2020
 ms.author: yifwang
 ms.reviewer: tapanm
 search.audienceType:
@@ -20,43 +20,43 @@ search.app:
 
 Specify one or more [behavior formulas](working-with-formulas-in-depth.md) that run when an event triggers a change in component instances. 
 
-For example, set a component's **OnReset** property to one or more formulas that do initialization, clear input. And reset values when the **Reset** function runs on the component instances.
+For example, set a component's **OnReset** property to one or more formulas that do initialization and clear input. Reset values when the **Reset** function runs on the component instances.
 
 ## OnReset
 
 With a component master selected, select **OnReset** in the drop-down list of properties (on the left side of the formula bar), and then enter one or more formulas.
 
 > [!div class="mx-imgBorder"]
-> ![OnReset example](./media/component-behavior/example-onreset.png)
+> ![OnReset example](./media/component-behavior/example-onreset.png "OnReset example")
 
 To test **OnReset**, configure a control to reset the component. For example, set the **OnSelect** property of a button to this formula: **Reset**(*ComponentName*).
 
 ### Example - Reset timer
 
 > [!div class="mx-imgBorder"]
-> ![OnReset example](./media/component-behavior/Resettimer.gif)
+> ![OnReset example](./media/component-behavior/Resettimer.gif "OnReset example")
 
 In this time picker component, two variables are used to display the time _selectedHour and _selectedMinute. When the picker gets reset, these variables should be reset to a default value, say 12: 12.  The OnReset property for the component has the following formula: **Set(_selectedHour,12); Set(_selectedMinute,12)**
 
 To trigger reset, go to a screen and insert an instance of the component. Add a button and configure OnSelect of the button to call **Reset(TimerComponent_instance)**  to trigger OnReset.
 
 > [!div class="mx-imgBorder"]
-> ![Reset button](./media/component-behavior/reset-button.png)
+> ![Reset button](./media/component-behavior/reset-button.png "Reset button")
 
 ## Update OnReset using custom property
 
-Besides resetting a component instance from the outside of the component, there's another method to trigger the OnReset from the inside. "**Raise OnReset when value changes**" is an option when creating a custom input property. And it allows the value changes of this property to trigger OnReset of the component. This method is designed to set and reset default value easily. 
+Besides resetting a component instance from outside of the component, there's another method to trigger the OnReset from the inside. "**Raise OnReset when value changes**" is an option when creating a custom input property. It allows the value changes of this property to trigger OnReset of the component. This method is designed to set and reset the default value easily. 
 
-> ![OnReset example](./media/component-behavior/property-trigger.png)
+> ![OnReset example](./media/component-behavior/property-trigger.png "OnReset example")
 
 ### Example
 
 > [!div class="mx-imgBorder"]
-> ![OnReset example](./media/component-behavior/updateordernumber2.gif)
+> ![OnReset example](./media/component-behavior/updateordernumber2.gif "OnReset example")
 
-Example above shows reviewing order numbers and updating the numbers. The numeric up and down component is used to increase or decrease number of orders. When selecting the gallery on the left, the default number of numeric up and down component is reset to display the order number of selected tool. "**Raise OnReset when value changes**" made it possible to reset the default value when the input changes. 
+The example above shows reviewing order numbers and updating the numbers. The numeric up and down component is used to increase or decrease number of orders. When selecting the gallery on the left, the default number of the numeric up and down component is reset to display the order number of the selected tool. **Raise OnReset when value changes** made it possible to reset the default value when the input changes. 
 
-To do so, check "**Raise OnReset when value changes**" of the default input property. **OnReset** of the component is set to **Set(_numericValue,'Numeric up down'.DefaultValue)**. _numericValue is the variable to store the value of the current order value. And set the **Default** of the text input control to **If(IsBlank(_numericValue), 'Numeric up down'.DefaultValue, _numericValue)**. 
+To do so, check **Raise OnReset when value changes** of the default input property. **OnReset** of the component is set to **Set(_numericValue,'Numeric up down'.DefaultValue)**. _numericValue is the variable to store the value of the current order value. Set the **Default** of the text input control to **If(IsBlank(_numericValue), 'Numeric up down'.DefaultValue, _numericValue)**.
 
 ### See also