Conflict

Author: Mattp123

powerapps-docs/maker/model-driven-apps/model-app-page-issues.md

@@ -2,7 +2,7 @@
 title: "Known issues with custom pages in a model-driven app"
 description: "Find the known issue that might occur when you create a custom page." 
 ms.custom: ""
-ms.date: 02/16/2024
+ms.date: 07/30/2024
 ms.reviewer: ""
 ms.subservice: mda-maker
 ms.topic: "article"
@@ -47,7 +47,7 @@ The custom page is a new page type within model-driven apps. Custom pages bring
 
 ## User-related issues
 
-* When a user with no Power Apps user privileges opens a custom page in the model-driven app, they see an error mentioning no active entitlements to use Power Apps.  More information: [Licensing overview for Microsoft Power Platform](/power-platform/admin/pricing-billing-skus) and the associated licensing guide.
+* When a user with no Power Apps user privileges opens a custom page in the model-driven app, they see an error mentioning no active entitlements to use Power Apps. More information: [Licensing overview for Microsoft Power Platform](/power-platform/admin/pricing-billing-skus) and the associated licensing guide.
 
 * Custom pages require third-party cookies to be enabled, which is required by the canvas app runtime.
 
@@ -57,7 +57,7 @@ The custom page is a new page type within model-driven apps. Custom pages bring
 
 * Native player support is available for iOS, Android, and Windows in online-only mode. Offline support currently isn't supported.
 
-* When you navigate back to a custom page from another page, the page state isn't restored so the page appears like a new navigation. State is also not persisted when switching between multi-session tabs in multi-session apps. For more information about multi-session support with model-driven apps, go to [Customer Service workspace sessions and tabs](/dynamics365/customer-service/csw-overview?tabs=customerserviceadmincenter).
+* When you go back to a custom page from another page, the page state isn't restored so the page appears like a new navigation. State is also not persisted when switching between multi-session tabs in multi-session apps. For more information about multi-session support with model-driven apps, go to [Customer Service workspace sessions and tabs](/dynamics365/customer-service/csw-overview?tabs=customerserviceadmincenter).
 
 * While attempting to sign in, the current behavior caused by a user selecting anywhere away from the sign in box causes the pop out window for sign in to shift behind the app browser.
 
@@ -68,9 +68,10 @@ The custom page is a new page type within model-driven apps. Custom pages bring
 * When there are multiple custom pages in an app, the consent dialog asks for data permissions for all of the connectors in all the custom pages even if they haven't yet been opened.
 
 ## Connections
+
 * All custom pages share the connection infrastructure, as if they were part of the same canvas app. For instance, if a model-driven app has two custom pages and one is connected to SQL Server while the other isn't, the consent dialog will still appear and require permission for SQL access even if the page being opened doesn't require it.
 * Custom pages in model-driven apps don't support connection detection through the *Connected.connected* property.
-
+* The number of connectors in a model-driven app, across all custom pages, shouldn't exceed 10. The number of connection references, across all custom pages, shouldn't exceed 20. The number of connectors and connection references can increase the wait time an app user experiences when the user plays an app with custom pages.
 
 ## See also
 

powerapps-docs/maker/model-driven-apps/model-app-page-overview.md

@@ -1,9 +1,8 @@
 ---
 title: "Converge model-driven and canvas apps using the custom page"
 description: "Add a custom page to use canvas as a page in your model-driven app" 
-ms.date: 05/26/2022
+ms.date: 07/30/2024
 ms.reviewer: "matp"
-
 ms.subservice: mda-maker
 ms.topic: overview
 author: "adrianorth"
@@ -69,6 +68,9 @@ Embedded canvas apps also use the canvas capabilities with a hosting approach th
 
 In most cases, we recommend that you use custom pages instead of embedded canvas apps for tighter integration and better performance. 
 
+> [!NOTE]
+> The number of custom pages in a model-driven app shouldn't exceed 25. The amount of custom pages in an app can increase the wait time an app user experiences when the user plays an app with custom pages, after the last app publish. The increased user wait time is limited to the first app launch, by the first user, after the last publish of the model-driven app.
+
 ## Migrating standalone canvas app content to custom pages
 
 Existing standalone canvas apps aren't supported for use as a custom page and the expected app structure is different. A standalone canvas app often has many screens with global access to all controls and variables. The custom page is expected to typically be a single screen with loose coupling to provide performance and co-development capabilities.
@@ -98,15 +100,15 @@ To migrate an existing standalone canvas app, first start by identifying a mappi
 
 * How is the custom page managed in a solution?
 
-  Each custom page is a separate component in the solution, which allows one maker to edit one custom page at a time. Most custom pages will have a single screen. Instead of multiple screens, they will use the custom page's navigation functions to move to another custom page or model-driven app page. When a custom page has multiple screens, it's still a single solution component so only one maker can be working on the contained set of screens.
+  Each custom page is a separate component in the solution, which allows one maker to edit one custom page at a time. Most custom pages will have a single screen. Instead of multiple screens, they'll use the custom page's navigation functions to move to another custom page or model-driven app page. When a custom page has multiple screens, it's still a single solution component so only one maker can be working on the contained set of screens.
 
 * What licenses are allowed to use a custom page and does a custom page impact app counts?
 
   The custom page uses a special canvas app type, which allows it to be managed differently. The custom page is considered part of the model-driven app infrastructure and can only be used within a model-driven app. So, it follows the license for the model-driven app. Also, custom pages don't count toward the app limits because they're treated as a page instead of an app.
 
 * Do custom pages need to be shared like standalone canvas apps?
 
-  The custom page is aligned with the model-driven app page sharing, which relies on the model-driven app sharing without sharing individual pages for app users. Makers may need to share the custom page to allow editing.
+  The custom page is aligned with the model-driven app page sharing, which relies on the model-driven app sharing without sharing individual pages for app users. Makers might need to share the custom page to allow editing.
 
 ### See also
 

powerapps-docs/maker/model-driven-apps/use-copilot-email-assist.md

@@ -3,7 +3,7 @@ title: Use Copilot in the email rich text editor
 description: Learn how to use Copilot in the rich text editor to make your customer emails clearer, shorter, and more compelling.
 author: udaykirang
 ms.author: udag
-ms.reviewer: shujoshi
+ms.reviewer: udag
 ms.topic: how-to
 ms.date: 04/17/2024
 ms.subservice: mda-maker
@@ -28,7 +28,7 @@ When you draft customer emails in the rich text editor in a model-driven app, Co
 
 ## Prerequisites
 
-The [generative AI feature in emails](/power-platform/admin/settings-features#ai-suggestions-for-email-content) must be turned on in the [canvas app feature settings](/power-platform/admin/settings-features).
+The [generative AI feature in emails](/power-platform/admin/settings-features#ai-suggestions-for-email-content) must be turned on in the [model-driven app feature settings](/power-platform/admin/settings-features).
 
 ## Draft and refine an email in the rich text editor
 

powerapps-docs/user/form-filling-assistance.md

@@ -1,7 +1,7 @@
 ---
 title: Copilot assistance for form fill in model-driven apps 
 description: Learn how to use AI-generated optional suggestions for fields in a form.
-ms.date: 07/16/2024
+ms.date: 07/31/2024
 ms.custom: 
   - responsible-ai-faqs
 ms.topic: article
@@ -75,7 +75,7 @@ To accept all suggestions on the open tab of the form, on the notification bar,
 
 :::image type="content" source="media/formfill_acceptall.png" alt-text="Screenshot that shows all form fill suggestions being accepted.":::
 
-To replace a suggestion with a different value, select the field and start typing to overwrite the suggestion. Alternative, select the field, select the **Backspace** or **Delete** key, and then start typing. 
+To replace a suggestion with a different value, select the field and start typing to overwrite the suggestion. Alternatively, select the field, select the **Backspace** or **Delete** key, and then start typing. 
 
 If you have unsaved suggestions in a form and try to navigate away, you get a prompt asking if you want to discard those suggestions. The suggestions are only saved when you accept them. You can continue navigating away or stay on the form to review your pending suggestions. You can also select **Do not show again** to avoid being prompted in the future.