Live publish for 18 November 2019.

Author: buck1ey

powerapps-docs/developer/common-data-service/media/register-spa-app-registration.PNG

@@ -20,8 +20,6 @@ search.app:
 With Common Data Service, XRM tooling enables you to connect to your Common Data Service environment by using connection strings. This is similar to the concept of connection strings used with **SQL Server**. Connection strings have native support in configuration files, including the ability to encrypt the configuration sections for maximum security. This enables you to configure Common Data Service connections at deployment time, and not hard code in your application to connect to your Common Data Service environment.  
 
 
-
-
 <a name="Create"></a> 
 
 ## Create a connection string
@@ -30,7 +28,7 @@ With Common Data Service, XRM tooling enables you to connect to your Common Data
 
 ```xml  
 <connectionStrings>  
-    <add name="MyCDSServer" connectionString="AuthType=OAuth;[email protected];Password=passcode;Url=https://contosotest.crm.dynamics.com;AppId=51f81489-12ee-4a9e-aaae-a2591f45987d;RedirectUri=app://58145B91-0C36-4500-8554-080854F2AC97;TokenCacheStorePath=c:\MyTokenCache;LoginPrompt=Auto"
+    <add name="MyCDSServer" connectionString="AuthType=OAuth;[email protected];Password=passcode;Url=https://contosotest.crm.dynamics.com;AppId=51f81489-12ee-4a9e-aaae-a2591f45987d;RedirectUri=app://58145B91-0C36-4500-8554-080854F2AC97;TokenCacheStorePath=c:\MyTokenCache;LoginPrompt=Auto"/>
 </connectionStrings>  
 ```  
 
@@ -84,7 +82,7 @@ CrmServiceClient svc = new CrmServiceClient(ConnectionString);
 
 ## Connection string examples
 
-The following examples show how you can use connection strings for connecting to online deployments and authentication scenarios. The connection string examples for on-premises and IFD deployment instances is now available in the Dynamics 365 Customer Engagement (on-premises) documentation at: [Use connection strings in XRM tooling to connect](/dynamics365/customer-engagement/on-premises/developer/xrm-tooling/use-connection-strings-xrm-tooling-connect) 
+The following examples show how you can use connection strings for connecting to online deployments and authentication scenarios. The connection string examples for on-premises and IFD deployment instances is now available in the Dynamics 365 Customer Engagement (on-premises) documentation at: [Use connection strings in XRM tooling to connect](/dynamics365/customerengagement/on-premises/developer/xrm-tooling/use-connection-strings-xrm-tooling-connect) 
 
 ### Named account using Office 365  
 
@@ -98,6 +96,7 @@ The following examples show how you can use connection strings for connecting to
 ```  
 
 ### OAuth using named account in Office 365 with UX to prompt for authentication  
+
 Create a new connection to Common Data Service using a UserID or Password via OAuth.
 
 > [!NOTE]
@@ -151,6 +150,7 @@ Create a new connection to Common Data Service using a Application or Client Id
 ```
 
 ### ClientId or Client Secret based authentication
+
 Create a new connection to Common Data Service using a Application or Client Id and a Client Secret.
 ```xml
 <add name="MyCDSServer" 

powerapps-docs/developer/common-data-service/media/register-spa-edit-manifest.PNG

@@ -1142,6 +1142,8 @@
           href: ./portals/admin/migrate-portal-configuration.md
         - name: About portal lifecycle
           href: ./portals/admin/portal-lifecycle.md
+        - name: Upgrade a portal
+          href: ./portals/admin/upgrade-portal.md
     - name: Advanced portal configuration
       items:
         - name: Overview
@@ -1190,12 +1192,22 @@
           href: ./portals/configure/place-child-nodes.md
         - name: Behavior and format of the date and time field
           href: ./portals/configure/behavior-format-date-time-field.md
+        - name: View email records in portal timeline
+          href: ./portals/configure/view-email-in-timeline.md
+        - name: Rate a webpage
+          href: ./portals/configure/rate-webpage.md
+        - name: Enable header and footer output caching on a portal
+          href: ./portals/configure/enable-header-footer-output-caching.md
         - name: Add chart on a web page in portal
           href: ./portals/configure/add-chart.md
         - name: Work with entity forms
           href: ./portals/configure/entity-forms.md
         - name: Work with entity lists
           href: ./portals/configure/entity-lists.md
+        - name: Manage websites
+          href: ./portals/configure/websites.md
+        - name:  Create and manage website bindings
+          href: ./portals/configure/website-bindings.md
         - name: Work with web forms
           items:
             - name: Define web form properties
@@ -1218,6 +1230,8 @@
               href: ./portals/configure/configure-web-form-subgrid.md
             - name: Add geolocation
               href: ./portals/configure/add-geolocation.md
+        - name: Implement GDPR in portals
+          href: ./portals/configure/implement-gdpr.md
     - name:  Advanced portal customization
       items:
         - name: Work with Liquid templates
@@ -1264,6 +1278,8 @@
                   href: ./portals/liquid/render-site-header-primary-navigation.md
         - name: OAuth 2.0 implicit grant flow
           href: ./portals/oauth-implicit-grant-flow.md
+        - name: Manage webpages
+          href: ./portals/configure/web-page.md
     - name: User management and security in portal
       items:
         - name: Configure contacts
@@ -1448,6 +1464,8 @@
       href: ./common-data-service/solution-history.md      
     - name: Use solution checker
       href: ./common-data-service/use-powerapps-checker.md
+    - name: "Common issues and resolutions: solution checker"
+      href: ./common-data-service/common-issues-resolutions-solution-checker.md
     - name: Use segmented solutions
       href: ./common-data-service/use-segmented-solutions-patches-simplify-updates.md
     - name: Change the solution publisher prefix

powerapps-docs/developer/common-data-service/xrm-tooling/use-connection-strings-xrm-tooling-connect.md

@@ -7,7 +7,7 @@ ms.service: powerapps
 ms.topic: conceptual
 ms.custom: canvas
 ms.reviewer: tapanm
-ms.date: 10/16/2016
+ms.date: 11/18/2019
 ms.author: litran
 search.audienceType: 
   - maker
@@ -20,19 +20,19 @@ This article shows you how to delete a canvas app from your PowerApps account an
 ## Delete an app from your account
 1. Open [powerapps.com](https://make.powerapps.com?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc), and then select **Apps** in the left **Tree view** pane.
 
-    ![](./media/delete-app/file-apps.png)
-2. (optional) Near the upper-left corner, filter the list of apps to show only those apps that you own or only those apps to which you contribute.
+    ![Apps](./media/delete-app/file-apps.png)
+2. (optional) Near the upper-right corner, filter the list of apps to show only those apps that you own or only those apps to which you contribute.
 
-    ![](./media/delete-app/filter-list.png)
+    ![Apps filter](./media/delete-app/filter-list.png)
 
     > [!NOTE]
    > If the app that you want to delete doesn't appear, make sure that you're in the right environment.
-3. Near the right edge, select the info icon for the app that you want to delete.
+3. Select **More Commands** (...) for the app that you want to delete.
 
-    ![](./media/delete-app/app-options.png)
-4. Near the upper-right corner, select the trash-can icon to delete the app.
+    ![More Commands](./media/delete-app/app-options.png)
+4. Select the trash-can icon to delete the app.
 
-    ![](./media/delete-app/delete-icon.png)
+    ![Delete](./media/delete-app/delete-icon.png)
 
     > [!NOTE]
    > You must have the **Contributor** permission for an app before you can delete it.
@@ -41,7 +41,7 @@ This article shows you how to delete a canvas app from your PowerApps account an
     > [!IMPORTANT]
    > This action will permanently delete this app not only from your account but also from the accounts of all users with whom this app was shared.
    
-    ![](./media/delete-app/delete-button.png)
+    ![Delete from cloud](./media/delete-app/delete-button.png)
 
 ## More resources
 [Share an app](share-app.md)  

powerapps-docs/maker/TOC.yml

@@ -111,7 +111,7 @@ You can find information about size limits on text, hyperlinks, images, and medi
 
 PowerApps per app plan allows individual users to run 2 applications on a single portal for a specific business scenario based on the full capabilities of PowerApps. This plan provides an easy way for users to get started with the platform before broader scale adoption.
 
-After an admin allocates PowerApps per app plan to an environment, they're assigned to users by default when app is shared with them. You can see how an admin allocates per app plans [here](https://docs.microsoft.com/power-platform/admin/capacity-add-on).
+After an admin allocates PowerApps per app plan to an environment, they're assigned to unlicensed users when an app in that environment is shared with them. You can see how an admin allocates per app plans [here](https://docs.microsoft.com/power-platform/admin/capacity-add-on).
 
 Follow these steps to turn off the assigning per app plans for users when an app is shared with them:
 
@@ -123,6 +123,8 @@ The **Auto assign per app passes** toggle appears in all app setting.
 
 > [!NOTE]
 > Disabling the per app plan is currently available for only canvas apps.  Model-driven apps and Portals will have this ability in the future.
+>
+> The ability to control per app plan assignment for an app is only available for apps that are in an environment that had Per app plans allocated in the [Power Platform Admin center](https://admin.powerplatform.microsoft.com).  
 
 ### App Settings