Merge branch 'master' into pehecke-solutions-update

Author: phecke

powerapps-docs/developer/common-data-service/best-practices/work-with-data/index.md

@@ -1,3 +1,39 @@
+<<<<<<< HEAD
+---
+title: "Developers: Best practices and guidance around working with data for the Common Data Service | Microsoft Docs"
+description: Best practices and guidance around working with data for developers of the Common Data Service in Power Apps.
+services: ''
+suite: powerapps
+documentationcenter: na
+author: jowells
+manager: austinj
+editor: ''
+tags: ''
+ms.service: powerapps
+ms.devlang: na
+ms.topic: article
+ms.tgt_pltfrm: na
+ms.workload: na
+ms.date: 12/12/2018
+ms.author: jowells
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Best practices and guidance around working with data for the Common Data Service
+
+This list below contains all of the best practices and guidance around integrating data using code with the Common Data Service.
+
+|Best Practice  |Description  |
+|---------|---------|
+|[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
+
+### See Also
+[Work with data using code in Common Data Service (PowerApps)](../../work-with-data-cds.md)<br />
+=======
 ---
 title: "Developers: Best practices and guidance around working with data for the Common Data Service | Microsoft Docs"
 description: Best practices and guidance around working with data for developers of the Common Data Service in Power Apps.
@@ -31,4 +67,5 @@ This list below contains all of the best practices and guidance around integrati
 |[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
 
 ### See Also
-[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
+[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
+>>>>>>> ae864535ae5aab1966c3c5bd8c4250316a788d91

powerapps-docs/developer/common-data-service/org-service/web-service-error-codes.md

@@ -1,8 +1,8 @@
 ---
-title: "<Topic Title> (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "<Description>" # 115-145 characters including spaces. This abstract displays in the search result.
+title: "Upload and manage document templates (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "In Common Data Service, the *template* entities help you create consistent layout and content in email messages, articles, mail merge documents, and Microsoft Office documents (Excel and Word)."
 ms.custom: ""
-ms.date: 10/31/2018
+ms.date: 06/19/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -33,4 +33,4 @@ These are the types of template entites:
 - [KbArticleTemplate](reference/entities/kbarticletemplate.md) 
 - [MailMergeTemplate](reference/entities/mailmergetemplate.md) 
 - [PersonalDocumentTemplate](reference/entities/personaldocumenttemplate.md) 
-- [Template](reference/entities/template.md) 
+- [Template](reference/entities/template.md)