Merge branch 'master' into pehecke-error-codes-update

Author: phecke

powerapps-docs/developer/component-framework/manifest-schema-reference/data-set.md

@@ -27,7 +27,7 @@ ms.assetid: 9ffe8930-b290-4252-98d4-a1195b00205f
 |`description-key`|Defines the description of the property.|`string`|Optional|Model-driven apps and canvas apps (public preview)|
 |`display-name-key`|Defines the name of the property.|`string`|Yes|Model-driven apps and canvas apps (public preview)|
 |`name`|Name of the grid|`string`|Yes|Model-driven apps and canvas apps (public preview)|
-|`cds-data-set-options`|Displays the Commandbar, ViewSelector, QuickFindSearch if set to true |`boolean`|Yes|Model-driven apps and canvas apps (public preview)|
+|`cds-data-set-options`|Displays the Commandbar, ViewSelector, QuickFindSearch if set to true |`boolean`|Yes|Model-driven apps|
 
 ## Parent Elements
 
@@ -46,4 +46,4 @@ ms.assetid: 9ffe8930-b290-4252-98d4-a1195b00205f
 
 [Power Apps component framework manifest schema reference](index.md)<br/>
 [Power Apps component framework API reference](../reference/index.md)<br/>
-[Power Apps component framework overview](../overview.md)
+[Power Apps component framework overview](../overview.md)

powerapps-docs/developer/model-driven-apps/clientapi/reference/formContext-data-entity/save.md

@@ -25,7 +25,7 @@ search.app:
 `formContext.data.entity.save(saveOption);`
 
 > [!NOTE]
-> This method is deprecated and we recommend to use the [formContext.entity.save](../formContext-data/save.md) method.
+> This method is deprecated and we recommend to use the [formContext.data.save](../formContext-data/save.md) method.
 
 ## Parameters
 

powerapps-docs/developer/model-driven-apps/clientapi/reference/formContext-data/save.md

@@ -14,9 +14,8 @@ search.app:
   - PowerApps
   - D365CE
 ---
-# save (Client API reference)
-
 
+# formContext.data.save (Client API reference)
 
 [!INCLUDE[./includes/save-description.md](./includes/save-description.md)]