Merge branch 'live' into shubham1172/time-zone-entities

Author: phecke

powerapps-docs/developer/common-data-service/behavior-format-date-time-attribute.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/model-driven-apps/clientapi/reference/formContext-ui-tabs/setDisplayState.md

@@ -1,6 +1,6 @@
 ---
 title: "setDisplayState (Client API reference) in model-driven apps| MicrosoftDocs"
-ms.date: 10/31/2018
+ms.date: 08/27/2020
 ms.service: powerapps
 ms.topic: "reference"
 applies_to: "Dynamics 365 (online)"
@@ -16,7 +16,8 @@ search.app:
 ---
 # setDisplayState (Client API reference)
 
-
+> [!IMPORTANT]
+> The setDisplayState method will be deprecated with the Release Wave One 2021 (April 2021). Use [setFocus](setfocus.md) method in the Unified Interface to ensure the correct tab is opened on a form.
 
 [!INCLUDE[./includes/setDisplayState-description.md](./includes/setDisplayState-description.md)]
 

powerapps-docs/maker/TOC.yml

@@ -1792,17 +1792,23 @@
     - name: Overview
       href: ../sample-apps/return-to-workplace/overview.md
     - name: Deploy the solution
-      href: ../sample-apps/return-to-workplace/deploy.md   
+      href: ../sample-apps/return-to-workplace/deploy.md
+    - name: Upgrade the solution
+      href: ../sample-apps/return-to-workplace/upgrade.md      
     - name: Configure the solution
       href: ../sample-apps/return-to-workplace/configure.md
     - name: Location Readiness dashboard
       href: ../sample-apps/return-to-workplace/dashboard-for-executive-leadership.md
+    - name: Workplace Care Management dashboard
+      href: ../sample-apps/return-to-workplace/dashboard-case-management.md
     - name: Facility Safety Management app
       href: ../sample-apps/return-to-workplace/app-for-facility-manager.md
     - name: Workplace Care Management app
       href: ../sample-apps/return-to-workplace/app-for-health-and-safety-lead.md
     - name: Employee Return to the Workplace app
       href: ../sample-apps/return-to-workplace/app-for-employee.md
+    - name: Extend the solutions
+      href: ../sample-apps/return-to-workplace/extend.md
 - name: Learn from others
   items:
   - name: Blog