Merge branch 'master' into portals-1973823

Author: tapanm-MSFT

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/maker/model-driven-apps/notes-control-legacy.md",
+      "redirect_url": "set-up-timeline-control",
+      "redirect_document_id": "false"
+    },
     {
       "source_path": "powerapps-docs/developer/common-data-service/webapi/samples/basic-operations-csharp.md",
       "redirect_url": "cdswebapiservice-basic-operations",
@@ -1921,4 +1926,4 @@
       "redirect_document_id": "false"
     }
   ]
-}
+}

app-selector2.png

@@ -31,6 +31,8 @@
       href: org-service/paging-behaviors-and-ordering.md
     - name: Use column comparison in queries
       href: column-comparison.md
+    - name: FetchXML search item limit
+      href: quick-find-limit.md
   - name: "Use SQL to query data (Preview)"
     href: cds-sql-query.md
   - name: Saved Queries

powerapps-docs/developer/common-data-service/TOC.yml

@@ -1,6 +1,6 @@
 ---
 title: "Activity entities (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "In Dynamics 365 (online), activities are tasks that you or your teams perform when they contact customers, for example, sending letters or making telephone calls." # 115-145 characters including spaces. This abstract displays in the search result.
+description: "Activities are tasks that you or your teams perform when they contact customers, for example, sending letters or making telephone calls." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
 ms.date: 10/31/2018
 ms.reviewer: "pehecke"

powerapps-docs/developer/common-data-service/activity-entities.md

@@ -63,7 +63,7 @@ Service level agreements (SLAs) in Common Data Service help you define the level
 
 <a name="Limitations"></a>   
 
-## Limitations to applying SLAs in Dynamics 365 (online)  
+## Limitations to applying SLAs  
 
  In Common Data Service, the following limitations are applicable for SLAs per Common Data Service instance (organization):  
 

powerapps-docs/developer/common-data-service/apply-slas-entities.md

@@ -34,7 +34,7 @@ If you have users and offices around the world, it is important to properly repr
 |Member name and value|Description|  
 |---------------------------|-----------------|  
 |`UserLocal`|-   Stores the date and time value as UTC value in the system.<br />-   The retrieve operation returns the UTC value.<br />-   The update operation converts the UTC value to the current user’s time zone value, and then stores the updated value as is or as the equivalent UTC value depending on the kind ([DateTimeKind](https://msdn.microsoft.com/library/shx7s921.aspx)) of the value specified for update. If the specified value is of UTC kind, it’s stored as is. Otherwise, the UTC-equivalent value is stored.<br />-   Retrieving the formatted value converts from UTC to the user’s current time zone based on the time zone and locale setting of the user.<br />-   For the Web API, the attribute is exposed as DateTimeOffset.<br />-   This behavior is used for system attributes like `CreatedOn` and `ModifiedOn`, and cannot be changed. You should use this behavior for custom attributes where you want to store date and time values with the time zone information.|  
-|`DateOnly`|-   Stores the actual date value with the time value as 12:00 AM (00:00:00) in the system.<br />-   For the retrieve and update operations, no time zone conversion is performed, and the time value is always 12 AM (00:00:00).<br />-   Retrieving the formatted value displays the date value without any time zone conversion.<br />-   For the Web API, the attribute is exposed as DateTimeOffset.<br />-   This behavior should be used for custom attributes that store birthdays and anniversaries, where the time information is not required.|  
+|`DateOnly`|-   Stores the actual date value with no time value.<br />-   Retrieving the formatted value displays the date value.<br />-   For the Web API, the attribute is exposed as Date.<br />-   This behavior should be used for custom attributes that store birthdays and anniversaries, where the time information is not required.|  
 |`TimeZoneIndependent`|-   Stores the actual date and time values in the system regardless of the user time zone.<br />-   For the retrieve and update operations, no time zone conversion is performed, and actual date and time values are returned and updated respectively in the system regardless of the user time zone.<br />-   Retrieving the formatted value displays the date and time value (without any time zone conversion) based on the format as specified by the current user’s time zone and locale setting.<br />-   For the Web API, the attribute is exposed as DateTimeOffset.<br />-   This behavior should be used for attributes that store information such as check in and check out time for hotels.|  
 
  The following sample code demonstrates how to set a `UserLocal` behavior for a new date time attribute:  

powerapps-docs/developer/common-data-service/behavior-format-date-time-attribute.md

@@ -1,6 +1,6 @@
 ---
 title: "Connect with Microsoft Office 365 and Common Data Service (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "The Microsoft Office 365 portal provides a single sign-on experience for Office 365 customers where they can sign in once and access any Office 365 application, including Dynamics 365 (online)" # 115-145 characters including spaces. This abstract displays in the search result.
+description: "The Microsoft Office 365 portal provides a single sign-on experience for Office 365 customers where they can sign in once and access any Office 365 application" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
 ms.date: 10/31/2018
 ms.reviewer: "pehecke"
@@ -22,14 +22,14 @@ Common Data Service is part of the Office 365 collaboration and productivity too
  Using federation, applications can connect to Common Data Service using the same system user identities and credentials available in an Azure Active Directory based network. More information: [Single sign-on roadmap](https://technet.microsoft.com/library/hh967643.aspx).  
 
 ## In This Section  
- [Dynamics 365 (online) Integration with Office 365](online-integration-office-365.md)  
+ [Common Data Service Integration with Office 365](online-integration-office-365.md)  
 
- [Authenticate Office 365 Users with Dynamics 365 (online) Web Services](/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services)  
+ [Authenticate Office 365 Users with Common Data Service Web Services](/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services)  
 
- [Sample: Authenticate Users with Dynamics 365 Web Services](/dynamics365/customer-engagement/developer/sample-authenticate-users-web-services)  
+ [Sample: Authenticate Users with Common Data Service Web Services](/dynamics365/customer-engagement/developer/sample-authenticate-users-web-services)  
 
 ## Related Sections  
- [Authenticate Users with Dynamics 365 Web Services](/dynamics365/customer-engagement/developer/authenticate-users)  
+ [Authenticate Users with Common Data Service Web Services](/dynamics365/customer-engagement/developer/authenticate-users)  
 
- [Connect to the Dynamics 365 Web Services](/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services)  
+ [Connect to the Common Data Service Web Services](/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services)  
 

powerapps-docs/developer/common-data-service/connect-microsoft-office-365.md

@@ -8,8 +8,6 @@ ms.service: powerapps
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.topic: "article"
-applies_to: 
-  - "Dynamics 365 (online)"
 helpviewer_keywords: 
   - "schemas"
 ms.assetid: 71e3e594-0240-4af1-99b4-135042b7a000
@@ -23,7 +21,6 @@ search.app:
   - PowerApps
   - D365CE
 ---
-<!-- https://docs.microsoft.com/dynamics365/customer-engagement/developer/customize-dev/customization-solutions-file-schema -->
 
 # Customization solutions file schema
 

powerapps-docs/developer/common-data-service/customization-solutions-file-schema.md

@@ -40,6 +40,7 @@ You can download tools used in development from NuGet using the  powershell scri
 1. Copy and paste the following PowerShell script into the PowerShell window and press Enter.
 
     ```powershell
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
     $sourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
     $targetNugetExe = ".\nuget.exe"
     Remove-Item .\Tools -Force -Recurse -ErrorAction Ignore

powerapps-docs/developer/common-data-service/download-tools-nuget.md

@@ -62,7 +62,7 @@ These are the localizable values that are used to refer to the attributes in an
 The `AttributeTypeName` property describes the type of an attribute. This property contains a value of type `AttributeTypeDisplayName` which provides a label for each the different types of attributes that exist. 
 
 > [!NOTE]
-> Don't be confused by the `AttributeType` property. The values in this older property are mostly aligned with `AttributeTypeName` except that it shows `ImageType` attributes as `Virtual`. You should refer to the `AttributeTypeName` property rather than the `AttributeType` property.
+> Don't be confused by the [AttributeType](/dotnet/api/microsoft.xrm.sdk.metadata.attributemetadata.attributetype#Microsoft_Xrm_Sdk_Metadata_AttributeMetadata_AttributeType) property. The values in this older property are mostly aligned with [AttributeTypeName](/dotnet/api/microsoft.xrm.sdk.metadata.attributemetadata.attributetypename#Microsoft_Xrm_Sdk_Metadata_AttributeMetadata_AttributeTypeName) except that it shows `ImageAttributeMetadata` and `MultiSelectPicklistAttributeMetadata` as `Virtual`. Refer to the `AttributeTypeName` property rather than the `AttributeType` property.
 
 In the following table: