Merge branch 'live' into JimDaly-patch-2

Author: KumarVivek

powerapps-docs/developer/component-framework/reference/mode/trackcontainerresize.md

@@ -14,7 +14,7 @@ applies_to:
   - "Dynamics 365 Version 9.x"
 ms.assetid: c5f482c2-dde2-460b-89a7-39e0efcc5704
 ---
-\
+
 # trackContainerResize
 
 [!INCLUDE [trackcontainerresize-description](includes/trackcontainerresize-description.md)]
@@ -34,4 +34,4 @@ ms.assetid: c5f482c2-dde2-460b-89a7-39e0efcc5704
 
 [Mode](../mode.md)<br/>
 [PowerApps component framework API Reference](../../reference/index.md)<br/>
-[PowerApps component framework Overview](../../overview.md)
+[PowerApps component framework Overview](../../overview.md)

powerapps-docs/maker/TOC.yml

@@ -407,6 +407,8 @@
             href: ./canvas-apps/functions/function-table-counts.md
           - name: CountRows
             href: ./canvas-apps/functions/function-table-counts.md
+          - name: Data types
+            href: ./canvas-apps/functions/data-types.md	    
           - name: DataSourceInfo
             href: ./canvas-apps/functions/function-datasourceinfo.md
           - name: Date

powerapps-docs/maker/canvas-apps/add-data-connection.md

@@ -16,12 +16,13 @@ search.app:
 ---
 # Add a data connection to a canvas app in PowerApps
 
-In PowerApps, add a data connection to an existing canvas app or to an app that you're building from scratch. Your app can connect to SharePoint, Salesforce, OneDrive, or [many other data sources](connections-list.md).
+In PowerApps, add a data connection to an existing canvas app or to an app that you're building from scratch. Your app can connect to SharePoint, Common Data Service, Salesforce, OneDrive, or [many other data sources](connections-list.md).
 
 Your [next step](#next-steps) after this article is to display and manage data from that data source in your app, as in these examples:
 
 * Connect to OneDrive, and manage data in an Excel workbook in your app.
 * Connect to Twilio, and send an SMS message from your app.
+* Connect to Common Data Service, and update an entity from your app.
 * Connect to SQL Server, and update a table from your app.
 
 ## Prerequisites
@@ -58,7 +59,7 @@ Your [next step](#next-steps) after this article is to display and manage data f
 
 1. Select **Create** to both create the connection and add it to your app.
 
-    Some connectors, such as **Office 365 Outlook**, require no additional steps, and you can show data from them immediately. Other connectors prompt you to provide credentials, specify a particular set of data, or perform other steps. For example, [SharePoint](connections/connection-sharepoint-online.md) and [SQL Server](connections/connection-azure-sqldatabase.md) require additional information before you can use them.
+    Some connectors, such as **Office 365 Outlook**, require no additional steps, and you can show data from them immediately. Other connectors prompt you to provide credentials, specify a particular set of data, or perform other steps. For example, [SharePoint](connections/connection-sharepoint-online.md) and [SQL Server](connections/connection-azure-sqldatabase.md) require additional information before you can use them. With [Common Data Service](connections/connection-common-data-service.md), you can change the environment before you select an entity.
 
 ## Identify or change a data source
 If you're updating an app, you might need to identify or change the source of data that appears in a gallery, a form, or another control. For example, you might need to identify a data source as you update an app that someone else created or that you created long ago.
@@ -77,5 +78,5 @@ If you're updating an app, you might need to identify or change the source of da
 
 ## Next steps
 
-* To show and update data in a source such as Excel, SharePoint, or SQL Server, [add a gallery](add-gallery.md), and [add a form](add-form.md).
+* To show and update data in a source such as Excel, SharePoint, Common Data Service, or SQL Server, [add a gallery](add-gallery.md), and [add a form](add-form.md).
 * For data in other sources, use connector-specific functions such as those for [Office 365 Outlook](connections/connection-office365-outlook.md), [Twitter](connections/connection-twitter.md), and [Microsoft Translator](connections/connection-microsoft-translator.md).

powerapps-docs/maker/canvas-apps/connections/connection-common-data-service.md

@@ -19,4 +19,12 @@ search.app:
 
 You can securely store your business data in Common Data Service and build rich apps in PowerApps so that users can manage that data. You can also integrate that data into solutions that include Microsoft Flow, Power BI, and data from Dynamics 365.
 
+By default, the Common Data Service connector connects to data in your app's current environmnent. If your app moves to another environment, the connector connects to data in the new environment. This works well for an app using a single environment or an app that follows an ALM process for moving from Development to Test to Production.
+
+When you add a data source with the Common Data Service connector, you can change the environment and then select one or more entities.  By default, the app connects to data in the current environment, and the UI shows **(Current)** over the list of entities. If you select **Change**, you can specify a different environment to pull data from it instead of or in addition to the current environment. 
+
+![Common Data Service Change Environment](media/connection-common-data-service/common-data-service-connection-change-environment.png)
+
+The Common Data Service connector is more robust than the Dynamics 365 connector and approaching feature parity.
+
 More information: [What is Common Data Service?](../../common-data-service/data-platform-intro.md)

powerapps-docs/maker/canvas-apps/connections/media/connection-common-data-service/common-data-service-connection-change-environment.png

@@ -25,7 +25,8 @@ Formulas combine many elements.  Listed below are:
 Other elements include:
 
 * [All operators](functions/operators.md)
-* [Controls and their properties](reference-properties.md)
+* [Controls and their properties](reference-properties.md)
+* [Data types](functions/data-types.md)
 
 ## A
 **[Abs](functions/function-numericals.md)** – Absolute value of a number.