Merge branch 'main' into patch-4

Author: Mattp123

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

@@ -72,7 +72,7 @@ Following the steps below will change the default label and text box column of t
 
 10. Select **Save and Close** to close the form editor.  
 
-## Add code component to an table
+## 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:
 

powerapps-docs/developer/component-framework/code-components-model-driven-apps.md

@@ -30,7 +30,7 @@ The [create your first code component](implementing-controls-using-typescript.md
 
 ## Add code components to model-driven apps
 
-To add code components to a column or an table in model-driven apps, see [Add code components to model-driven apps](add-custom-controls-to-a-field-or-entity.md).
+To add code components to a column or a table in model-driven apps, see [Add code components to model-driven apps](add-custom-controls-to-a-field-or-entity.md).
 
 > [!div class="mx-imgBorder"] 
 > ![Add linear slider control](../../maker/model-driven-apps/media/add-slider.PNG "Add linear slider control")

powerapps-docs/developer/component-framework/sample-controls/angular-flip-control.md

@@ -47,7 +47,7 @@ The flip component sample consists of a label and a button. When you click on th
 - When the component is loaded, the label shows the text based on the bind column value. The `context.parameters.[property_name].attributes` contains the associated definitions.
 - For Yes/No columns, `context.parameters.[property_name].Options` will include both true and false value. 
 - Selecting on the Flip button, the label will update the value using **notifyOutputEvents** method, [getOutputs](../reference/control/getoutputs.md) method will be called asynchronously and will flow to Power Apps component framework. 
-- ClientAPI updates the bind column value, and the updated value flows to the component label. You can also use `ClientAPI` to update an column value to trigger control's [updateView](../reference/control/updateview.md) method. The component then updates the third-party model and the label gets updated.
+- ClientAPI updates the bind column value, and the updated value flows to the component label. You can also use `ClientAPI` to update a column value to trigger control's [updateView](../reference/control/updateview.md) method. The component then updates the third-party model and the label gets updated.
 
 
 ## Code

powerapps-docs/developer/component-framework/sample-controls/data-set-grid-control.md

@@ -15,7 +15,7 @@ ms.assetid: 356561d0-a36b-4b93-8b76-3e1abf9414e9
 
 # Implementing data-set component
 
-This sample component shows how to change the user experience of interacting with the dataset. For example, you only see the home page grid on an table homepage as a table. You can build your code component that can display the data as per your choice. This sample shows the records as tiles instead of the regular tabular grid. You can download the sample component from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/component-framework/TS_DataSetGrid).
+This sample component shows how to change the user experience of interacting with the dataset. For example, you only see the home page grid on a table homepage as a table. You can build your code component that can display the data as per your choice. This sample shows the records as tiles instead of the regular tabular grid. You can download the sample component from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/component-framework/TS_DataSetGrid).
 
 [!INCLUDE[cc-terminology](../../data-platform/includes/cc-terminology.md)]
 

powerapps-docs/developer/data-platform/behavior-format-date-time-attribute.md

@@ -116,7 +116,7 @@ Console.WriteLine("Created attribute '{0}' with UserLocal behavior\nfor the Acco
      For custom date and time columns that are part of a Dataverse organization, the `DateTimeAttributeMetadata.CanChangeDateTimeBehavior` managed property is set to `True` unless the column or the parent table is not customizable.  
 
     > [!NOTE]
-    >  When you update `DateTimeAttributeMetadata.DateTimeBehavior` property of an column from `UserLocal` to `DateOnly`, ensure that you also change the`DateTimeAttributeMetadata.Format` property from `DateAndTime` to `DateOnly`. Otherwise, an exception will occur.  
+    >  When you update `DateTimeAttributeMetadata.DateTimeBehavior` property of a column from `UserLocal` to `DateOnly`, ensure that you also change the`DateTimeAttributeMetadata.Format` property from `DateAndTime` to `DateOnly`. Otherwise, an exception will occur.  
   
 -   The following out-of-box date and time columns in Dataverse are by default set to `DateOnly` and the `DateTimeAttributeMetadata.CanChangeDateTimeBehavior` managed property is set to `False` of these columns, which implies that you cannot change the behavior for these columns:  
 
@@ -136,7 +136,7 @@ Console.WriteLine("Created attribute '{0}' with UserLocal behavior\nfor the Acco
 
      The behavior of these columns is set to `UserLocal` and the `DateTimeAttributeMetadata.CanChangeDateTimeBehavior` managed property to `True`, and you can change the behavior of these columns to `DateOnly` only. No other behavior transitions are allowed.  
 
- After updating the behavior of an column, you must publish the customizations for the change to take effect. Updating the behavior of a date and time column ensures that all the values entered/updated *after* the column behavior was changed, are stored in the system as per the new behavior. This does not impact the values that are already stored in the database, and they continue to be stored as UTC values. However, when you retrieve the existing values using SDK or view it in the UI, the existing values are displayed as per the new behavior of the column. For example, if you changed the behavior of a custom column on an account from `UserLocal` to `DateOnly` and retrieve an existing account record using SDK, the date and time will be displayed as \<Date> followed by time as 12 AM (00:00:00). Similarly, for the behavior change from `UserLocal` to `TimeZoneIndependent`, the actual value in the database will be displayed as is without any time zone conversions.  
+ After updating the behavior of a column, you must publish the customizations for the change to take effect. Updating the behavior of a date and time column ensures that all the values entered/updated *after* the column behavior was changed, are stored in the system as per the new behavior. This does not impact the values that are already stored in the database, and they continue to be stored as UTC values. However, when you retrieve the existing values using SDK or view it in the UI, the existing values are displayed as per the new behavior of the column. For example, if you changed the behavior of a custom column on an account from `UserLocal` to `DateOnly` and retrieve an existing account record using SDK, the date and time will be displayed as \<Date> followed by time as 12 AM (00:00:00). Similarly, for the behavior change from `UserLocal` to `TimeZoneIndependent`, the actual value in the database will be displayed as is without any time zone conversions.  
 
  The following sample code demonstrates how to update the behavior of a date and time column:  
 
@@ -212,11 +212,11 @@ Console.WriteLine("Published customizations to the Account .\n");
   
  Some important points to be considered while using the `ConvertDateAndTimeBehavior` message:  
 
--   You should avoid any major changes to the solutions in Dataverse during the execution of the message such as importing a solution or deleting an column or parent table. Doing so might lead to unexpected behavior; however no data loss will occur.  
+-   You should avoid any major changes to the solutions in Dataverse during the execution of the message such as importing a solution or deleting a column or parent table. Doing so might lead to unexpected behavior; however no data loss will occur.  
 
 -   Updates done in the system as a result of executing the message won’t run workflows and plug-ins.  
 
--   Updates done in the system as a result of executing the message won’t change the “last modified on” value for the columns, but will be audited to help the administrators to determine the time of the conversion and the original/changed values for an column.  
+-   Updates done in the system as a result of executing the message won’t change the “last modified on” value for the columns, but will be audited to help the administrators to determine the time of the conversion and the original/changed values for a column.  
 
  The following sample code shows how to use the message:  
 

powerapps-docs/developer/data-platform/browse-your-metadata.md

@@ -77,7 +77,7 @@ You can perform the following actions for a single table:
     - **Filter Attributes**: Filter columns by any attribute property values.
     - **Filter Properties**: Filter the properties displayed for the selected attribute.
 
-- **Keys**: If alternate keys are enabled for an table you can examine how they are configured.
+- **Keys**: If alternate keys are enabled for a table you can examine how they are configured.
 
 - **Relationships**: View the three types of table relationships: One-To-Many, Many-To-One, and Many-To-Many. With these views you can:  
     - **Edit Relationship**: Open the selected relationship form in the default organization, if the relationship supports this.  

powerapps-docs/developer/data-platform/calculated-rollup-attributes.md

@@ -62,7 +62,7 @@ search.app:
 |      Property       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Definition                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 |---------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `FormulaDefinition` |                                                                                                                                                                                                                                                                                                                                                                                                                                                                   Contains the XAML definition of the formula used to perform the calculation or rollup. The only supported way to change this value is through the application formula editor.<br /><br /> For information about configuring the formulas for these columns see the following topics in the customization guide: [Define rollup columns](https://docs.microsoft.com/powerapps/maker/data-platform/define-rollup-fields) and [Define calculated columns](https://docs.microsoft.com/powerapps/maker/data-platform/define-calculated-fields).                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|  `SourceTypeMask`   | The bitmask value of this read-only property describes the types of sources used in the formula of the calculated column or if the formula of a calculated or rollup column is not valid.<br /><br /> -   0: **Undefined**. The default value for simple and rollup columns.<br />-   1: **Simple**. The calculated column refers to an column in the same record.<br />-   2: **Related**. The calculated column refers to an column in a related record.<br />-   4: `Logical`. The calculated column refers to an column in the same record which is actually stored in a different database table. More information: [Logical columns](/dynamics365/customer-engagement/developer/introduction-to-entity-attributes#BKMK_LogicalAttributes)<br />-   8: `Calculated`. The calculated column refers to another calculated column.<br />-   16: `Rollup`. The calculated column refers a rollup column.<br />-   32: `Invalid`. The calculated or rollup column is invalid.<br />     Typically this would be where a column refers to an column that no longer exists. **Note:**  One or more of these conditions may be true for any calculated or rollup column. Because this is a bitmask value, you may find it useful to use the [SourceTypeMasks enumeration](calculated-rollup-attributes.md#BKMK_SourceTypeMasks) when performing bitwise operations. |
+|  `SourceTypeMask`   | The bitmask value of this read-only property describes the types of sources used in the formula of the calculated column or if the formula of a calculated or rollup column is not valid.<br /><br /> -   0: **Undefined**. The default value for simple and rollup columns.<br />-   1: **Simple**. The calculated column refers to a column in the same record.<br />-   2: **Related**. The calculated column refers to a column in a related record.<br />-   4: `Logical`. The calculated column refers to a column in the same record which is actually stored in a different database table. More information: [Logical columns](/dynamics365/customer-engagement/developer/introduction-to-entity-attributes#BKMK_LogicalAttributes)<br />-   8: `Calculated`. The calculated column refers to another calculated column.<br />-   16: `Rollup`. The calculated column refers a rollup column.<br />-   32: `Invalid`. The calculated or rollup column is invalid.<br />     Typically this would be where a column refers to a column that no longer exists. **Note:**  One or more of these conditions may be true for any calculated or rollup column. Because this is a bitmask value, you may find it useful to use the [SourceTypeMasks enumeration](calculated-rollup-attributes.md#BKMK_SourceTypeMasks) when performing bitwise operations. |
 
 
 ## Calculated columns 
@@ -158,11 +158,11 @@ search.app:
     /// </summary>  
     Undefined = 0,  
     /// <summary>  
-    /// Simple: 1 - The calculated column refers to an column in the same record.  
+    /// Simple: 1 - The calculated column refers to a column in the same record.  
     /// </summary>  
     Simple = 1,  
     /// <summary>  
-    /// Related: 2 - The calculated column refers to an column in a related record.  
+    /// Related: 2 - The calculated column refers to a column in a related record.  
     /// </summary>  
     Related = 2,  
     /// <summary>  
@@ -179,7 +179,7 @@ search.app:
     Rollup = 16,  
     /// <summary>  
     /// Invalid: 32 - The calculated or rollup column is invalid.  
-    /// Typically this would be where a field refers to an column that no longer exists.   
+    /// Typically this would be where a field refers to a column that no longer exists.   
     /// </summary>  
     Invalid = 32  
 }