Merge pull request #1736 from MicrosoftDocs/master

Making CDS Security info more discoverable

Author: KumarVivek

powerapps-docs/developer/common-data-service/virtual-entities/get-started-ve.md

@@ -55,18 +55,17 @@ In this release, there are some limitations to virtual entities that you need to
     - All entity properties must be represented as Common Data Service attributes. You can use simple types representing text, numbers, optionsets, dates, images, and lookups. 
     - You must be able to model any entity relationships in Common Data Service.
     - An attribute on a virtual entity cannot be calculated or rollup.  Any desired calculations must be done on the external side, possibly within or directed by the data provider.
+    - Although you can add virtual entity columns as a lookup on a grid or other UI views, you cannot filter or sort based on this virtual entity lookup column.
 - Auditing and change tracking is not supported.  These may be implemented within the external data store.
 - Virtual entities cannot be enabled for queues.
 - Offline caching of values is not supported for virtual entities.
 - A virtual entity cannot represent an activity and do not support business process flows.
 - Once created, a virtual entity cannot be changed to be a standard (non-virtual) entity.  The reverse is also true: a standard entity cannot be converted into a virtual entity.
 
-<!-- TODO: Make bulleted list into table?  Make more complete by reviewing API modification tables. -->
-
 For more information about how these limitations are reflected in the Common Data Service API, see [API considerations of virtual entities](api-considerations-ve.md). 
 
 ### See also
 
 [API considerations of virtual entities](api-considerations-ve.md)<br />
 [Custom virtual entity data providers](custom-ve-data-providers.md)<br />
-[Sample: Generic virtual entity data provider plug-in](sample-generic-ve-plugin.md)
+[Sample: Generic virtual entity data provider plug-in](sample-generic-ve-plugin.md)

powerapps-docs/index.md

@@ -290,6 +290,7 @@ ms.custom:
                                     <p><a class="barLink" style="font-size: 0.95rem" href="/powerapps/maker/common-data-service/fields-overview">Fields</a></p>
                                     <p><a class="barLink" style="font-size: 0.95rem" href="/powerapps/maker/common-data-service/cds-processes">Apply business logic</a></p>
                                     <p><a class="barLink" style="font-size: 0.95rem" href="/powerapps/maker/common-data-service/solutions-overview">Solutions</a></p>
+                                    <p><a class="barLink" style="font-size: 0.95rem" href="/power-platform/admin/wp-security">Security in Common Data Service</a></p>
                                     <p><a class="barLink" style="font-size: 0.95rem" href="https://www.microsoft.com/en-us/download/details.aspx?id=57777">Whitepaper: ALM using solutions</a></p>
                                     <p><a class="barLink" style="font-size: 0.95rem" href="/powerapps/maker/common-data-service/data-platform-powerbi-connector">Build Power BI reports from Common Data Service data</a></p>
                                  </div>

powerapps-docs/maker/TOC.yml

@@ -1161,6 +1161,8 @@
     href: ./common-data-service/export-customized-entity-field-text-translation.md
   - name: Import translated entity and field text into an app
     href: ./common-data-service/import-translated-entity-field-text.md
+  - name: Security in Common Data Service
+    href: /power-platform/admin/wp-security
   - name: For developers
     href: ../developer/common-data-service/overview.md
     # href: ../developer/common-data-service/TOC.yml  changing this to have developer TOC rather than buried in maker toc

powerapps-docs/maker/common-data-service/data-platform-intro.md

@@ -1,12 +1,12 @@
 ---
 title: What is Common Data Service? | Microsoft Docs
-description: Introduction to Common Data Service, entities, and server-side logic.
+description: Introduction to Common Data Service, entities, server-side logic, security, and developer capabilities.
 author: clwesene
 manager: kvivek
 ms.service: powerapps
 ms.topic: overview
 ms.component: cds
-ms.date: 05/08/2019
+ms.date: 06/21/2019
 ms.reviewer: matp
 ms.author: matp
 search.audienceType: 
@@ -71,14 +71,18 @@ Entities within Common Data Service can leverage rich server-side logic and vali
 * **Workflows** allow you to automate business processes without user interaction. For more information, see [Workflows overview](/dynamics365/customer-engagement/customize/workflow-processes).
 * **Business logic with code** supports advanced developer scenarios to extend the application directly through code. For more information, see [Apply business logic with code](../../developer/common-data-service/apply-business-logic-with-code.md).
 
+## Security
+Common Data Service has a rich security model to protect the data integrity and privacy of users while promoting efficient data access and collaboration. You can combine business units, role-based security, record-based security, and field-based security to define the overall access to information that users have in a Common Data Service environment. More information: [Security in Common Data Service](/power-platform/admin/wp-security) 
+
 ## Developer capabilities
 In addition to the features available through the [PowerApps](https://web.powerapps.com/?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc) portal, Common Data Service also includes features for developers to programmatically access metadata and data to create entities and business logic, as well as interact with data. For more information, see [Common Data Service Developer Overview](../../developer/common-data-service/overview.md)
 
 ## Next steps
 To get started using Common Data Service:
-* [Create an app using a Common Data Service database](../canvas-apps/data-platform-create-app-scratch.md).
-* [Create a custom entity](create-custom-entity.md) and then [create an app that uses that entity](../canvas-apps/data-platform-create-app.md).
-* [Use Power Query](./data-platform-cds-newentity-pq.md) to connect to an online or on-premises data source and import the data directly into Common Data Service.
+- [Create a canvas app using a Common Data Service database](../canvas-apps/data-platform-create-app-scratch.md).
+- [Create a custom entity](create-custom-entity.md) and then [create a canvas app that uses the entity](../canvas-apps/data-platform-create-app.md).
+- [Create a model-driven app](/powerapps/maker/model-driven-apps/build-first-model-driven-app) built on Common Data Service.
+- [Use Power Query](./data-platform-cds-newentity-pq.md) to connect to an online or on-premises data source and import the data directly into Common Data Service.
 
 ## Privacy notice
 With the Microsoft PowerApps common data model, Microsoft collects and stores custom entity and field names in our diagnostic systems. We use this knowledge to improve the common data model for our customers. The entity and field names that app Creators create help us understand scenarios that are common across the Microsoft PowerApps community and ascertain gaps in the service’s standard entity coverage, such as schemas related to organizations. The data in the database tables associated with these entities is not accessed or used by Microsoft or replicated outside of the region in which the database is provisioned. Note, however, that the custom entity and field names may be replicated across regions and are deleted in accordance with our data retention policies. Microsoft is committed to your privacy as described further in our [Trust Center](https://www.microsoft.com/trustcenter/Privacy/default.aspx).