Merge branch 'main' into patch-2

Author: iaanw

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

@@ -48,9 +48,10 @@ Developers can bundle all the HTML, CSS, and TypeScript files into a single [sol
 - Optimized for performance
 - Reusability
 - Ability to bundle all files into a single solution file.
+- Ability to handle being destroyed and reloaded for performance reasons while preserving state.
 
 ## Licensing
-<!--note from editor: I stopped here, in case this content is direct from CELA, except I turned "is" into "are" in the first sentence. Also made a couple of changes to the Note.-->
+
 Power Apps component framework licensing requirements are inline with existing connectors and components and are based on the type of data and connections used in your app. More information: [Power Apps pricing](https://powerapps.microsoft.com/pricing/). To align with the licensing requirements, we will be classifying code components into two types:
 
 - Code components that connect to external services or data directly via the user's browser client and not through connectors are considered as premium. When these components are used in an app, the app becomes premium, and end-users are required to have **Power Apps** licenses.

powerapps-docs/developer/data-platform/dataverse-sql-query.md

@@ -75,8 +75,7 @@ You can use the **Analyze in Power BI** option (**Data** > **Tables** > **Analyz
 
 Any operation that attempts to modify data (that is, INSERT, UPDATE) will not work with this read-only SQL data connection. For a detailed list of supported SQL operations on the Dataverse endpoint, see [How Dataverse SQL differs from Transact-SQL](how-dataverse-sql-differs-from-transact-sql.md).
 
-The following Dataverse datatypes are not supported with the SQL connection: `binary`, `image`,
-`ntext`, `sql_variant`, `varbinary`, `virtual`, `HierarchyId`, `managedproperty`, `file`, `xml`, `partylist`, `timestamp`, `choices`.
+The following Dataverse datatypes are not supported with the SQL connection: `binary`, `image`, `sql_variant`, `varbinary`, `virtual`, `HierarchyId`, `managedproperty`, `file`, `xml`, `partylist`, `timestamp`, `choices`.
 
 > [!TIP]
 > `partylist` attributes can instead be queried by joining to the `activityparty` table as shown below.
@@ -100,6 +99,9 @@ Dataverse choice columns are represented as \<choice\>Name and \<choice\>Label i
 
 There is an 80-MB maximum size limit for query results returned from the Dataverse endpoint. Consider using data integration tools such as [Azure Synapse Link for Dataverse](../../maker/data-platform/export-to-data-lake.md) and [dataflows](/power-bi/transform-model/dataflows/dataflows-introduction-self-service) for large data queries that return over 80 MB of data. More information: [Importing and exporting data](../../maker/data-platform/import-export-data.md)
 
+> [!TIP]
+> To help keep the size of the returned data within acceptable limits, use as few multi-line text columns and choice columns as possible.
+
 Dates returned in query results are formatted as Universal Time Coordinated (UTC). Previously, dates were returned in local time.
 
 Querying data using SQL does not trigger any plug-ins registered on the <xref:Microsoft.Xrm.Sdk.Messages.RetrieveMultipleRequest> or <xref:Microsoft.Xrm.Sdk.Messages.RetrieveRequest> messages. Any rewriting of the query or results that would normally be performed by such a plug-in will therefore not take effect for a SQL query.
@@ -141,9 +143,16 @@ A blocked port error may look something like the following.
 
 ![Error message.](media/TDS-SQL-blocked-port-error.png)
 
-The solution is to verify the TCP ports 1433 or 5558 from the client are unblocked. One possible method to do that is described below.
+The solution is to verify the TCP ports 1433 or 5558 from the client are unblocked. Use one of the following methods to do that is described below.
+
+#### Use PowerShell to validate connection with TDS endpoint
+
+1. Open a PowerShell command window.
+2. Run the Test-connection command. <br> `Test-NetConnection -ComputerName <environment>.crm.dynamics.com -port 1433`
+
+If the connection is successful a line "TcpTestSucceeded : True" will be returned.
 
-#### Establish a telnet session to the TDS service listener
+#### Establish a telnet session to the TDS endpoint
 
 1. On a Microsoft Windows computer, install/enable telnet.
     1. Choose **Start**.
@@ -156,7 +165,7 @@ The solution is to verify the TCP ports 1433 or 5558 from the client are unblock
 
 If the connection is successful, you will be in an active telnet session. If unsuccessful, you will receive the error:
 
-“Connecting to <environmentname>.crm.dynamics.com… Could not open connection to the host, on port 1433: connect failed”. 
+“Connecting to \<environmentname>.crm.dynamics.com… Could not open connection to the host, on port 1433: connect failed”. 
 
 This means the port has been blocked at the client.
 

powerapps-docs/developer/data-platform/how-dataverse-sql-differs-from-transact-sql.md

@@ -17,9 +17,7 @@ search.app:
   - D365CE
 ---
 
-# How Dataverse SQL differs from Transact-SQL (Preview)
-
-[!INCLUDE[cc-beta-prerelease-disclaimer](../../includes/cc-beta-prerelease-disclaimer.md)]
+# How Dataverse SQL differs from Transact-SQL
 
 This article describes the differences between Dataverse SQL and Transact-SQL. Dataverse SQL is a subset of Transact-SQL.
 
@@ -42,6 +40,7 @@ More information: [Data types (Transact-SQL)](/sql/t-sql/data-types/data-types-t
 - nchar
 - numeric
 - nvarchar*
+- nvarchar(max)      # multi-line text
 - real
 - smalldatetime
 - smallint
@@ -62,13 +61,9 @@ More information: [Data types (Transact-SQL)](/sql/t-sql/data-types/data-types-t
 
 - binary
 - image
-- ntext
-- nvarchar(max)
 - sql_variant
-- text
 - timestamp
 - varbinary
-- varchar(max)
 - virtual
 - partylist
 - HierarchyId
@@ -424,4 +419,4 @@ Hints are not supported.
 
 [Use SQL to query data](dataverse-sql-query.md)
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/model-driven-apps/use-iframe-and-web-resource-controls-on-a-form.md

@@ -23,7 +23,11 @@ IFRAME and web resource controls embed content from another ___location in pages by
 > [!NOTE]
 >  The designs you choose for the form are also used for the Dynamics 365 for Outlook reading pane and forms used by Dynamics 365 tablets. Web resources and IFRAMEs aren’t displayed using the Dynamics 365 for Outlook reading pane, however, they are supported in Dynamics 365 for tablets. If your IFRAME depends on access to the `Xrm` object of the page or any form event handlers, you should configure the IFRAME so that it's not visible by default.  
 
- You can use an IFRAME to display the contents from another website in a form, for example, in an ASP.NET page. Displaying a form within an IFrame embedded in another form is not supported.  
+You can use an IFRAME to display the contents from another website in a form, for example, in an ASP.NET page. 
+
+It is recommended to use [Power Apps component framework components](../component-framework/custom-controls-overview.md) if you're considering to use a web resource to show content that users will interact with.
+ 
+Displaying a form within an IFrame embedded in another form is not supported.  
 
  You can use one of the following web resources to display the contents of web resources in a form:  
 
@@ -153,4 +157,4 @@ IFrame.setSrc(newTarget);
 
 
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/model-driven-apps/webpage-html-web-resources.md

@@ -34,6 +34,8 @@ Because an HTML web resource is just streamed to the user's browser, it can incl
 
 - HTML web resources can only accept a limited number of query string parameters. [Pass parameters to HTML web resources](webpage-html-web-resources.md#BKMK_PassingParametersToWebResources)  
 
+- HTML web resources embedded as controls in a form can be reloaded by the form runtime for performance reasons. For example, the form runtime may destroy and re-initialize the control during tab navigations. 
+
 <a name="BKMK_UsingTextEditor"></a>
 
 ## Use the text editor for HTML web resources
@@ -150,4 +152,4 @@ Because of the capability for the HTML in web resources to be changed by using t
  [Using Stylesheet (XSL) web resources](stylesheet-xsl-web-resources.md)
 
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/maker/TOC.yml

@@ -2447,6 +2447,8 @@
               href: ../teams/localizing-sample-apps.md
             - name: Theming in sample apps 
               href: ../teams/sample-app-theming.md
+            - name: Working with table permission in sample apps
+              href: ../teams/dataverse-for-teams-table-permissions.md
         - name: FAQs for sample apps
           href: ../teams/sample-apps-faqs.md
     - name: Known issues and limitations

powerapps-docs/maker/portals/configure/web-page.md

@@ -5,7 +5,7 @@ author: sandhangitmsft
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 04/21/2020
+ms.date: 08/19/2021
 ms.subservice: portals
 ms.author: sandhan
 ms.reviewer: tapanm
@@ -65,6 +65,9 @@ The table below explains many of the standard web page attributes used by portal
 
 Page comments provides users with the ability to view and post comments on a web page. By default this feature is disabled and can be enabled on a page by page basis.
 
+> [!NOTE]
+> Comments are available when pages use **Full page** or **Page** page template.
+
 1. Open the [Portal Management app](configure-portal.md).
 
 2. Go to **Portals** > **Web Pages**.