Merge pull request #310 from MicrosoftDocs/master

v-alje · web-flow · commit 51fe2fb697b1 · 2018-04-03T15:44:02.000-07:00
4/3 PM Publish
diff --git a/powerapps-docs/developer/common-data-service/apply-business-logic-with-code.md b/powerapps-docs/developer/common-data-service/apply-business-logic-with-code.md
@@ -1,6 +1,6 @@
 ---
 title: Apply business logic with code | Microsoft Docs
-description: Learn how developers can use code to apply business logic in the Common Data Service for Apps.
+description: Learn how developers can use code to apply business logic in Common Data Service for Apps.
 services: ''
 suite: powerapps
 documentationcenter: na
@@ -30,7 +30,7 @@ More information: [Dynamics 365 Customer Engagement Developer Guide: Custom work
 
 ## Create a plug-in
 
-You can write a .NET assembly to plug-in to the data transaction flow to apply business logic on the server. With the Common Data Service for Apps platform there is a framework that allows you to register specific events to execute code defined within a class in an assembly. That class inherits a specific interface that exposes an [Execute method](/dotnet/api/microsoft.xrm.sdk.iplugin.execute). When the registered event occurs, the `Execute` method on the class is invoked and passed contextual data about the event.
+You can write a .NET assembly to plug-in to the data transaction flow to apply business logic on the server. With Common Data Service for Apps there is a framework you use to register specific events to execute code defined within a class in an assembly. That class inherits a specific interface that exposes an [Execute method](/dotnet/api/microsoft.xrm.sdk.iplugin.execute). When the registered event occurs, the `Execute` method on the class is invoked and passed contextual data about the event.
 
 You will use the *Plug-in Registration Tool* to register your assemblies.
 
diff --git a/powerapps-docs/developer/common-data-service/entities.md b/powerapps-docs/developer/common-data-service/entities.md
@@ -1,6 +1,6 @@
 ---
 title: Common Data Service for Apps entities | Microsoft Docs
-description: Learn about the entities available in the Common Data Service for Apps.
+description: Learn about the entities available in Common Data Service for Apps.
 services: ''
 suite: powerapps
 documentationcenter: na
@@ -18,7 +18,7 @@ ms.author: jdaly
 ---
 # Common Data Service for Apps entities
 
-Providing storage for data is the most important function of the Common Data Service for apps. The common data service includes a base set of entities that provide structure for data used by business applications. 
+Providing storage for data is the most important function of Common Data Service for Apps. Common Data Service includes a base set of entities that provide structure for data used by business applications. 
 
 You can view the base set of entities in the [Common Data Service for Apps entity reference](reference/about-entity-reference.md).
 
@@ -33,18 +33,18 @@ There are several ways to edit entity metadata using designers.
 
 |Designer  |Description  |
 |---------|---------|
-|powerapps.com|The easiest and most common approach to modify the schema is to use the [powerapps.com](https://web.powerapps.com/) site to edit the common data service associated with an environment. Changes applied here are performed in the context of an unmanaged Common Data Service Default solution. <!-- TODO: Add link to topic that describes this -->|
-|Common Data Service Default solution explorer|There is another designer available from the [powerapps.com](https://web.powerapps.com/) site when editing the common data service. In the lower left-hand corner, the **Advanced** button will open the solution explorer to the Common Data Service Default solution. |
+|powerapps.com|The easiest and most common approach to modify the schema is to use the [powerapps.com](https://web.powerapps.com/) site to edit Common Data Service associated with an environment. Changes applied here are performed in the context of an unmanaged Common Data Service Default solution. <!-- TODO: Add link to topic that describes this -->|
+|Common Data Service Default solution explorer|There is another designer available from the [powerapps.com](https://web.powerapps.com/) site when editing Common Data Service. In the lower left-hand corner, the **Advanced** button will open the solution explorer to the Common Data Service Default solution. |
 |Solution explorer for your solution |If you will distribute a solution you should create any new entities, attributes, or relationships in the context of the unmanaged solution that you will use to develop your solution. <br /> More information: [Create a solution publisher and solution](introduction-solutions.md#create-a-solution-publisher-and-solution)|
 |From the form editor|When editing a model-driven app form for an entity, you can click the **New Field** button in the **Field Explorer**. If you create a lookup field, you will create a new entity relationship to support it.|
 
 ### Import a solution
 
-A solution can contain entity metadata and other customized components. Importing a managed or unmanaged solution into your common data service tenant will include those entities or extend existing entities with the new entity metadata they contain.
+A solution can contain entity metadata and other customized components. Importing a managed or unmanaged solution into your Common Data Service for Apps tenant will include those entities or extend existing entities with the new entity metadata they contain.
 
 ### From a data source using Power Query
 
-You can create new entities and fill them with data using Power Query. More information: [Add data to an entity in the Common Data Service by using Power Query](../../maker/common-data-service/data-platform-cds-newentity-pq.md)
+You can create new entities and fill them with data using Power Query. More information: [Add data to an entity in Common Data Service by using Power Query](../../maker/common-data-service/data-platform-cds-newentity-pq.md)
 
 ### Use metadata services
 
@@ -54,7 +54,7 @@ More information: [Metadata Services](use-web-services.md#metadata-services)
 
 ## Entity metadata
 
-The data model is defined as metadata that is stored within the common data service. This data about the schema is known as *Entity Metadata*. 
+The data model is defined as metadata that is stored within Common Data Service. This data about the schema is known as *Entity Metadata*. 
 
 - The [EntityMetadata Class](/dotnet/api/microsoft.xrm.sdk.metadata.entitymetadata) defines this with the Organization service. 
 - The [EntityMetadata EntityType](/dynamics365/customer-engagement/web-api/entitymetadata) defines this for the Web API. 
@@ -71,7 +71,7 @@ The Entity metadata includes the following information:
 |Keys|By default, each entity has a single GUID (globally unique identifier) attribute and the `Keys` property is an empty collection. You can add alternate keys to an entity. More information: [Entity Keys](entity-metadata.md#entity-keys)|
 
 > [!TIP]
-> Developing an understanding of the entity metadata in the system can help you understand how the common data service works. Many of the properties also control what entities in model-driven apps can do. The designers available to edit metadata cannot show all the details found in the metadata. You can install a model-driven app called the Metadata Browser which will allow you to view all the hidden entities and metadata properties that are found in the system. More information: [Dynamics 365 Customer Engagement Developer Guide: Browse the metadata for your organization](/dynamics365/customer-engagement/developer/browse-your-metadata)
+> Developing an understanding of the entity metadata in the system can help you understand how Common Data Service works. Many of the properties also control what entities in model-driven apps can do. The designers available to edit metadata cannot show all the details found in the metadata. You can install a model-driven app called the Metadata Browser which will allow you to view all the hidden entities and metadata properties that are found in the system. More information: [Dynamics 365 Customer Engagement Developer Guide: Browse the metadata for your organization](/dynamics365/customer-engagement/developer/browse-your-metadata)
 
 ### See also
 
diff --git a/powerapps-docs/developer/common-data-service/entity-attribute-metadata.md b/powerapps-docs/developer/common-data-service/entity-attribute-metadata.md
@@ -1,6 +1,6 @@
 ---
 title: Attribute metadata | Microsoft Docs
-description: Learn about the attribute metadata use in the Common Data Service for Apps.
+description: Learn about the attribute metadata use in Common Data Service for Apps.
 services: ''
 suite: powerapps
 documentationcenter: na
@@ -116,7 +116,7 @@ This property can have the following values set:
 |`ApplicationRequired`|2|**Business Required**|The attribute is required by the business to have a value.|
 |`Recommended`|3|**Business Recommended**|It is recommended that the attribute has a value.|
 
-The Common Data Service only enforces the `SystemRequired` option for attributes created by the system. Custom attributes cannot be set to use the `SystemRequired` option. 
+Common Data Service for Apps only enforces the `SystemRequired` option for attributes created by the system. Custom attributes cannot be set to use the `SystemRequired` option. 
 
 Model-driven apps will enforce the `ApplicationRequired` option and use a different presentation for the `Recommended` option. Creators of custom clients may use this information to require similar validation or presentation options.
 
diff --git a/powerapps-docs/developer/common-data-service/entity-metadata.md b/powerapps-docs/developer/common-data-service/entity-metadata.md
@@ -1,6 +1,6 @@
 ---
 title: Entity metadata | Microsoft Docs
-description: Learn about the entity metadata use in the Common Data Service for Apps.
+description: Learn about the entity metadata use in Common Data Service for Apps.
 services: ''
 suite: powerapps
 documentationcenter: na
@@ -19,7 +19,7 @@ ms.author: jdaly
 
 # Entity metadata
 
-Each entity provides the capability to store structured data. For developers, entities correspond to the classes you will use when working with data in the Common Data Service.
+Each entity provides the capability to store structured data. For developers, entities correspond to the classes you will use when working with data in Common Data Service for Apps.
 
 ## Entity names
 Each entity has a unique name defined when it is created. This name is presented in several ways:
diff --git a/powerapps-docs/developer/common-data-service/entity-relationship-metadata.md b/powerapps-docs/developer/common-data-service/entity-relationship-metadata.md
@@ -1,6 +1,6 @@
 ---
 title: Entity relationship metadata | Microsoft Docs
-description: Learn about the entity relationship metadata used in the Common Data Service for Apps.
+description: Learn about the entity relationship metadata used in Common Data Service for Apps.
 services: ''
 suite: powerapps
 documentationcenter: na
diff --git a/powerapps-docs/developer/common-data-service/introduction-solutions.md b/powerapps-docs/developer/common-data-service/introduction-solutions.md
@@ -18,13 +18,13 @@ ms.author: jdaly
 ---
 # Introduction to solutions
 
-*Solutions* are how customizers and developers author, package, and maintain units of software that extend the Common Data Service for Apps. Customizers and developers distribute solutions so that organizations can use the Common Data Service for Apps to install and uninstall the business functionality defined by the solution.
+*Solutions* are how customizers and developers author, package, and maintain units of software that extend Common Data Service for Apps. For example, the Dynamics 365 for Sales, Marketing, Customer Service apps are composed of solutions. Customizers and developers distribute solutions so that organizations can use Common Data Service for Apps to install and uninstall the business functionality defined by the solution.
 
-Every customization that you make to the Common Data Service for Apps is part of a solution. Every change you apply is tracked and any dependencies can be calculated. When you export a managed solution, it contains all the changes that have been applied for that solution into a file that you can then import into a different Common Data Service for Apps environment.
+Every customization that you make to Common Data Service for Apps, or to a previously installed solution, is part of a solution. Every change you apply is tracked and any dependencies can be calculated. When you export a managed solution, it contains all the changes that have been applied for that solution into a file that you can then import into a different Common Data Service for Apps environment.
 
 If you intend to transport customizations or extensions between different Common Data Service for Apps environments or distribute solutions using AppSource, you must understand the solution framework.
 
-## Unmanaged and managed solutions
+## Managed and unmanaged solutions
 
 There are two types of solutions: *managed* and *unmanaged*.
 
@@ -47,6 +47,7 @@ An **unmanaged** solution is one that is still under development or isn’t inte
  > You cannot import a managed solution into the same environment that contains the originating unmanaged solution. To test a managed solution, you need a separate environment to import it into.
 
 ## Solution publishers
+
 Each solution is linked to a solution publisher. The solution publisher provides information about how to contact the publisher as well a customization prefix value. The default value is `new`.
 
 When any schema changes are included as part of a solution, the solution publisher customization prefix is prepended to the name of the schema items. Any custom actions also have this value appended to them. This is valuable because it allows for easy recognition of which solution added the schema item or custom action. It is not required for all schema items and custom actions in a solution to use the same customization prefix, but it is strongly recommended.
@@ -67,7 +68,7 @@ From [powerapps.com](https://web.powerapps.com)
 1. Select the *Waffle* icon at the top left corner
 2. In the fly out, select **All apps**.
 3. Look for the **Dynamics 365 - custom app**.
- You may want to click the elipses (...) and choose **Pin this app** so it will be easier to navigate to next time.
+ You may want to click the ellipses (...) and choose **Pin this app** so it will be easier to navigate to next time.
 4. Click the **Dynamics 365 - custom app** app and select it.
 5. Navigate to **Settings** > **Customization** > **Customizations**.
 
@@ -111,7 +112,7 @@ The following diagram introduces how managed solutions and unmanaged customizati
 
 In this example, default behavior defined in the system solution is overridden or appended by managed solutions. Any unmanaged customizations can then override or append customizations that are then visible in the application.
 
-More information: [Dynamics 365 Customer Engagement Developer Guide: Introduction to solutions > Unmanaged and managed solutions](/dynamics365/customer-engagement/developer/introduction-solutions#unmanaged-and-managed-solutions)
+More information: [Dynamics 365 Customer Engagement Developer Guide: Introduction to solutions > Unmanaged and managed solutions](/dynamics365/customer-engagement/developer/introduction-solutions#managed-and-unmanaged-solutions)
 
 ## Managed properties
 
diff --git a/powerapps-docs/developer/common-data-service/overview.md b/powerapps-docs/developer/common-data-service/overview.md
@@ -1,6 +1,6 @@
 ---
 title: Common Data Service for Apps Developer Overview | Microsoft Docs
-description: Learn how developers can add value using the Common Data Service for apps.
+description: Learn how developers can add value using Common Data Service for Apps.
 services: ''
 suite: powerapps
 documentationcenter: na
@@ -17,22 +17,22 @@ ms.date: 03/19/2018
 ms.author: jdaly
 ---
 # Common Data Service for Apps Developer Overview
-PowerApps offers users, businesses, partners, independent software vendors (ISVs), and systems integrators (SIs) a powerful platform for building line-of-business apps. The new addition to PowerApps in this release is the new Common Data Service for Apps. The Common Data Service for Apps now contains the core functionality of the Dynamics 365 Customer Engagement platform.
+PowerApps offers users, businesses, independent software vendors (ISVs), and systems integrators (SIs) a powerful platform for building line-of-business apps. The new addition to PowerApps in this release is the expansion of the Common Data Service, now called Common Data Service for Apps which now contains the core functionality of the Dynamics 365 platform that powers Dynamics 365 for Sales, Marketing, Customer Service.
 
 
 ## Get Started
-If you are already experienced with the Dynamics 365 Customer Engagement apps, you will find that you will be able to apply your experience to customize and extend the Common Data Service for Apps.
+If you are already experienced with the Dynamics 365 for Sales, Marketing, or Customer Service apps, you will find that you will be able to apply your experience to customize and extend Common Data Service for Apps.
 
-If you are new to the Dynamics 365 Customer Engagement applications, the following topics provide a high-level overview of the important concepts to help you get started working with the Common Data Service for apps.
+If you are new to the Dynamics 365 for Sales, Marketing, or Customer Service apps, the following topics provide a high-level overview of the important concepts to help you get started working with Common Data Service for Apps.
 
 > [!NOTE]
-> - Model-driven apps connect to the Common Data Service for Apps. For information about how developers can add value at the application level, see [Model-driven apps Developer Overview](../model-driven-apps/overview.md). Content in this section will refer only to extensions developers can do at the service level. 
-> - Because the Common Data Service for Apps and Dynamics 365 Customer Engagement leverage the same platform, you will find more complete information for developers in the [Dynamics 365 Customer Engagement Developer Guide](/dynamics365/customer-engagement/developer/developer-guide). These topics will provide an overview with links to the developer guide and other guides for more information.
+> - Model-driven apps connect to Common Data Service for Apps. For information about how developers can add value at the application level, see [Model-driven apps Developer Overview](../model-driven-apps/overview.md). Content in this section will refer only to extensions developers can do at the service level. 
+> - Because Common Data Service for Apps is the same platform used by Dynamics 365 for Sales, Marketing, or Customer Service apps, you will find more complete information for developers in the [Dynamics 365 Customer Engagement Developer Guide](/dynamics365/customer-engagement/developer/developer-guide). These topics will provide an overview with links to the developer guide and other guides for more information.
 
 
 ## Tools and resources for developers
 
-Developers will use the following tools and resources when working with solutions using the common data service for apps.
+Developers will use the following tools and resources when working with solutions using Common Data Service for apps.
 
 ### Tools available for download from NuGet
 
@@ -129,11 +129,11 @@ More information: [Dynamics 365 Customer Engagement Developer Guide: Extend Dyna
 
 
 
-### Community Tools for Common Data Service for apps
+## Community Tools for Common Data Service for Apps
 
 The Dynamics 365 community creates tools! Many of the most popular ones are distributed in the [XrmToolBox](https://www.xrmtoolbox.com/). XrmToolBox is a Windows application that connects to Common Data Service for Apps, providing tools to ease customization, configuration and operation tasks. It is shipped with more than 30 plugins to make administration, customization or configuration tasks easier and less time consuming.
 
-The following is a selected list of community tools distributed via the XrmToolBox that you can use with the Common Data Service for Apps.
+The following is a selected list of community tools distributed via the XrmToolBox that you can use with Common Data Service for Apps.
 
 |Tool  |Description  |
 |---------|---------|
diff --git a/powerapps-docs/developer/common-data-service/use-web-services.md b/powerapps-docs/developer/common-data-service/use-web-services.md
diff --git a/powerapps-docs/developer/model-driven-apps/overview.md b/powerapps-docs/developer/model-driven-apps/overview.md
